From a1583120f3b39a0fafdbd05e7cabe4faf2f9527e Mon Sep 17 00:00:00 2001
From: Steam Deck User <motolegacy.git@gmail.com>
Date: Tue, 27 Dec 2022 16:33:52 -0500
Subject: [PATCH] Server: Award Points for reviving player

---
 source/server/damage.qc              | 24 ++++++++++++++----------
 source/server/weapons/weapon_core.qc |  1 +
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/source/server/damage.qc b/source/server/damage.qc
index 7cfdbe3..d5c8ef8 100644
--- a/source/server/damage.qc
+++ b/source/server/damage.qc
@@ -213,6 +213,16 @@ void() GetDown =
 	// Get Rid of Mule Kick Weapon (FIXME -- this just obliterates the third slot)
 	self.thirdweapon = 0;
 
+	// Calculate the loss in points, take away points from downed Player.
+	float point_difference;
+	point_difference = self.points;
+	point_difference -= 10*rint((self.points*0.95)/10);
+	addmoney(self, point_difference * -1, false);
+	self.requirespower = point_difference;
+
+	// Broadcast that the player has downed.
+	BroadcastMessage(time + 3, 2);
+
 	// Reset state
 	self.velocity = self.zoom = 0;
 	self.downed = true;
@@ -235,16 +245,6 @@ void() GetDown =
 		self.progress_bar_percent = 1;
 	}
 
-	// Calculate the loss in points, take away points from downed Player.
-	float point_difference;
-	point_difference = self.points;
-	point_difference -= 10*rint((self.points*0.95)/10);
-	addmoney(self, point_difference * -1, false);
-	self.requirespower = point_difference;
-
-	// Broadcast that the player has downed.
-	BroadcastMessage(time + 3, 2);
-
 	// Take away weapons and Perks
 	self.perks = 0;
 	SetPerk(self, self.perks);
@@ -372,6 +372,10 @@ void () GetUp =
 	}
 	self.teslacount = 0;
 
+	if (!coop) {
+		addmoney(self, self.requirespower, false);
+	}
+
 	if (self.weaponbk)
 	{
 		self.weapon = self.weaponbk;
diff --git a/source/server/weapons/weapon_core.qc b/source/server/weapons/weapon_core.qc
index 2883014..ba263df 100644
--- a/source/server/weapons/weapon_core.qc
+++ b/source/server/weapons/weapon_core.qc
@@ -2328,6 +2328,7 @@ void() CheckPlayer =
 					self.progress_bar_time = 0;
 					self.progress_bar_percent = 0;
 					self.revived = 0;
+					addmoney(self, ent.requirespower, false);
 				}
 			}
 			else if (!self.button7 && self.reviving) {