From: terencehill <piuntn@gmail.com>
Date: Sat, 13 Jul 2024 22:09:03 +0000 (+0200)
Subject: Fix #2917 "Issues with vampirehook and warpzones"
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=012414d8fd599f29cb2cfde86bb8b903a0ec7d97;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2917 "Issues with vampirehook and warpzones"
---

diff --git a/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc b/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc
index 18d0f4ad2..e484d0113 100644
--- a/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc
+++ b/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc
@@ -17,10 +17,10 @@ MUTATOR_HOOKFUNCTION(vh, GrappleHookThink)
 	if (!autocvar_g_vampirehook_damage || thehook.last_dmg > time || time < game_starttime)
 		return;
 
-	entity hook_owner = thehook.owner;
+	entity hook_owner = thehook.realowner;
 	entity hook_aiment = thehook.aiment;
 
-	if (IS_PLAYER(hook_aiment) && !STAT(FROZEN, hook_aiment)
+	if (hook_owner != hook_aiment && IS_PLAYER(hook_aiment) && !STAT(FROZEN, hook_aiment)
 		&& (DIFF_TEAM(hook_owner, hook_aiment) || autocvar_g_vampirehook_teamheal)
 		&& GetResource(hook_aiment, RES_HEALTH) > 0)
 	{