Merge pull request #43 from Psykotikism/v8.64

v8.64

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## Version 8.64 (August 23, 2019)
+
+Bug fixes:
+
+1. Fixed a timer error from the Whirl ability.
+2. Fixed the Clone ability not replacing dead clones.
+3. Fixed the issue with several abilities causing permanent gravity changes.
+4. Fixed the issue with Tanks dying randomly.
+
+Files:
+
+1. Updated include file.
+
 ## Version 8.63 (June 25, 2019)
 
 Bug fixes:

addons/sourcemod/scripting/include/mutant_tanks.inc

@@ -17,7 +17,7 @@
 #include <sdktools>
 
 #define MT_AUTHOR "Psyk0tik (Crasher_3637)"
-#define MT_VERSION "8.63"
+#define MT_VERSION "8.64"
 #define MT_URL "https://forums.alliedmods.net/showthread.php?t=302140"
 
 #define MT_TAG "[MT]"

addons/sourcemod/scripting/mutant_tanks/mt_choke.sp

@@ -50,7 +50,7 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 
 bool g_bChoke[MAXPLAYERS + 1], g_bChoke2[MAXPLAYERS + 1], g_bChoke3[MAXPLAYERS + 1], g_bChoke4[MAXPLAYERS + 1], g_bChoke5[MAXPLAYERS + 1], g_bCloneInstalled;
 
-float g_flChokeAngle[MAXPLAYERS + 1][3], g_flChokeChance[MT_MAXTYPES + 1], g_flChokeDamage[MT_MAXTYPES + 1], g_flChokeDelay[MT_MAXTYPES + 1], g_flChokeDuration[MT_MAXTYPES + 1], g_flChokeHeight[MT_MAXTYPES + 1], g_flChokeRange[MT_MAXTYPES + 1], g_flChokeRangeChance[MT_MAXTYPES + 1], g_flHumanCooldown[MT_MAXTYPES + 1], g_flOriginalGravity[MAXPLAYERS + 1];
+float g_flChokeAngle[MAXPLAYERS + 1][3], g_flChokeChance[MT_MAXTYPES + 1], g_flChokeDamage[MT_MAXTYPES + 1], g_flChokeDelay[MT_MAXTYPES + 1], g_flChokeDuration[MT_MAXTYPES + 1], g_flChokeHeight[MT_MAXTYPES + 1], g_flChokeRange[MT_MAXTYPES + 1], g_flChokeRangeChance[MT_MAXTYPES + 1], g_flHumanCooldown[MT_MAXTYPES + 1];
 
 int g_iAccessFlags[MT_MAXTYPES + 1], g_iAccessFlags2[MAXPLAYERS + 1], g_iChokeAbility[MT_MAXTYPES + 1], g_iChokeCount[MAXPLAYERS + 1], g_iChokeEffect[MT_MAXTYPES + 1], g_iChokeHit[MT_MAXTYPES + 1], g_iChokeHitMode[MT_MAXTYPES + 1], g_iChokeMessage[MT_MAXTYPES + 1], g_iChokeOwner[MAXPLAYERS + 1], g_iHumanAbility[MT_MAXTYPES + 1], g_iHumanAmmo[MT_MAXTYPES + 1], g_iImmunityFlags[MT_MAXTYPES + 1], g_iImmunityFlags2[MAXPLAYERS + 1];
 
@@ -366,22 +366,14 @@ public void MT_OnPluginEnd()
 		if (bIsSurvivor(iSurvivor, MT_CHECK_INGAME|MT_CHECK_ALIVE|MT_CHECK_KICKQUEUE) && g_bChoke[iSurvivor])
 		{
 			SetEntityMoveType(iSurvivor, MOVETYPE_WALK);
-			SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+			SetEntityGravity(iSurvivor, 1.0);
 		}
 	}
 }
 
 public void MT_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 {
-	if (StrEqual(name, "player_spawn"))
-	{
-		int iSurvivorId = event.GetInt("userid"), iSurvivor = GetClientOfUserId(iSurvivorId);
-		if (bIsSurvivor(iSurvivor, MT_CHECK_INDEX|MT_CHECK_INGAME|MT_CHECK_KICKQUEUE|MT_CHECK_ALIVE))
-		{
-			g_flOriginalGravity[iSurvivor] = GetEntityGravity(iSurvivor);
-		}
-	}
-	else if (StrEqual(name, "player_death"))
+	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
 		if (MT_IsTankSupported(iTank, MT_CHECK_INDEX|MT_CHECK_INGAME|MT_CHECK_KICKQUEUE))
@@ -581,7 +573,7 @@ static void vReset2(int survivor, int tank, int messages)
 	g_iChokeOwner[survivor] = 0;
 
 	SetEntityMoveType(survivor, MOVETYPE_WALK);
-	SetEntityGravity(survivor, g_flOriginalGravity[survivor]);
+	SetEntityGravity(survivor, 1.0);
 
 	if (g_iChokeMessage[MT_GetTankType(tank)] & messages)
 	{
@@ -597,7 +589,6 @@ static void vReset3(int tank)
 	g_bChoke4[tank] = false;
 	g_bChoke5[tank] = false;
 	g_iChokeCount[tank] = 0;
-	g_flOriginalGravity[tank] = 1.0;
 }
 
 static bool bHasAdminAccess(int admin)
@@ -752,7 +743,6 @@ public Action tTimerChokeLaunch(Handle timer, DataPack pack)
 	flVelocity[2] = g_flChokeHeight[MT_GetTankType(iTank)];
 
 	TeleportEntity(iSurvivor, NULL_VECTOR, NULL_VECTOR, flVelocity);
-	g_flOriginalGravity[iSurvivor] = GetEntityGravity(iSurvivor);
 	SetEntityGravity(iSurvivor, 0.1);
 
 	DataPack dpChokeDamage;
@@ -818,7 +808,7 @@ public Action tTimerChokeDamage(Handle timer, DataPack pack)
 	TeleportEntity(iSurvivor, NULL_VECTOR, NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
 
 	SetEntityMoveType(iSurvivor, MOVETYPE_NONE);
-	SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+	SetEntityGravity(iSurvivor, 1.0);
 
 	vDamageEntity(iSurvivor, iTank, g_flChokeDamage[MT_GetTankType(iTank)], "16384");
 

addons/sourcemod/scripting/mutant_tanks/mt_clone.sp

@@ -475,8 +475,8 @@ static void vCloneAbility(int tank)
 						g_iCloneOwner[iSelectedType] = tank;
 
 						int iNewHealth = (g_iCloneHealth[MT_GetTankType(tank)] > MT_MAXHEALTH) ? MT_MAXHEALTH : g_iCloneHealth[MT_GetTankType(tank)];
-						//SetEntityHealth(iSelectedType, iNewHealth);
-						SetEntProp(iSelectedType, Prop_Send, "m_iHealth", iNewHealth);
+						SetEntityHealth(iSelectedType, iNewHealth);
+						//SetEntProp(iSelectedType, Prop_Send, "m_iHealth", iNewHealth);
 						SetEntProp(iSelectedType, Prop_Send, "m_iMaxHealth", iNewHealth);
 
 						if (MT_IsTankSupported(tank, MT_CHECK_FAKECLIENT) && g_iHumanAbility[MT_GetTankType(tank)] == 1)

addons/sourcemod/scripting/mutant_tanks/mt_gravity.sp

@@ -50,7 +50,7 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 
 bool g_bCloneInstalled, g_bGravity[MAXPLAYERS + 1], g_bGravity2[MAXPLAYERS + 1], g_bGravity3[MAXPLAYERS + 1], g_bGravity4[MAXPLAYERS + 1], g_bGravity5[MAXPLAYERS + 1], g_bGravity6[MAXPLAYERS + 1], g_bGravity7[MAXPLAYERS + 1];
 
-float g_flGravityChance[MT_MAXTYPES + 1], g_flGravityDuration[MT_MAXTYPES + 1], g_flGravityForce[MT_MAXTYPES + 1], g_flGravityRange[MT_MAXTYPES + 1], g_flGravityRangeChance[MT_MAXTYPES + 1], g_flGravityValue[MT_MAXTYPES + 1], g_flHumanCooldown[MT_MAXTYPES + 1], g_flOriginalGravity[MAXPLAYERS + 1];
+float g_flGravityChance[MT_MAXTYPES + 1], g_flGravityDuration[MT_MAXTYPES + 1], g_flGravityForce[MT_MAXTYPES + 1], g_flGravityRange[MT_MAXTYPES + 1], g_flGravityRangeChance[MT_MAXTYPES + 1], g_flGravityValue[MT_MAXTYPES + 1], g_flHumanCooldown[MT_MAXTYPES + 1];
 
 int g_iAccessFlags[MT_MAXTYPES + 1], g_iAccessFlags2[MAXPLAYERS + 1], g_iGravity[MAXPLAYERS + 1], g_iGravityAbility[MT_MAXTYPES + 1], g_iGravityCount[MAXPLAYERS + 1], g_iGravityCount2[MAXPLAYERS + 1], g_iGravityEffect[MT_MAXTYPES + 1], g_iGravityHit[MT_MAXTYPES + 1], g_iGravityHitMode[MT_MAXTYPES + 1], g_iGravityMessage[MT_MAXTYPES + 1], g_iGravityOwner[MAXPLAYERS + 1], g_iHumanAbility[MT_MAXTYPES + 1], g_iHumanAmmo[MT_MAXTYPES + 1], g_iHumanMode[MT_MAXTYPES + 1], g_iImmunityFlags[MT_MAXTYPES + 1], g_iImmunityFlags2[MAXPLAYERS + 1];
 
@@ -409,14 +409,6 @@ public void MT_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 			vReset2(iTank);
 		}
 	}
-	else if (StrEqual(name, "player_spawn"))
-	{
-		int iSurvivorId = event.GetInt("userid"), iSurvivor = GetClientOfUserId(iSurvivorId);
-		if (bIsSurvivor(iSurvivor, MT_CHECK_INDEX|MT_CHECK_INGAME|MT_CHECK_KICKQUEUE|MT_CHECK_ALIVE))
-		{
-			g_flOriginalGravity[iSurvivor] = GetEntityGravity(iSurvivor);
-		}
-	}
 	else if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
@@ -690,7 +682,6 @@ static void vGravityHit(int survivor, int tank, float chance, int enabled, int m
 					MT_PrintToChat(tank, "%s %t", MT_TAG3, "GravityHuman2", g_iGravityCount2[tank], g_iHumanAmmo[MT_GetTankType(tank)]);
 				}
 
-				g_flOriginalGravity[survivor] = GetEntityGravity(survivor);
 				SetEntityGravity(survivor, g_flGravityValue[MT_GetTankType(tank)]);
 
 				DataPack dpStopGravity;
@@ -743,7 +734,7 @@ static void vRemoveGravity(int tank)
 			g_bGravity2[iSurvivor] = false;
 			g_iGravityOwner[iSurvivor] = 0;
 
-			SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+			SetEntityGravity(iSurvivor, 1.0);
 		}
 	}
 }
@@ -777,7 +768,6 @@ static void vReset2(int tank, bool revert = false)
 	g_iGravity[tank] = INVALID_ENT_REFERENCE;
 	g_iGravityCount[tank] = 0;
 	g_iGravityCount2[tank] = 0;
-	g_flOriginalGravity[tank] = 1.0;
 }
 
 static void vReset3(int tank)
@@ -982,7 +972,7 @@ public Action tTimerStopGravity(Handle timer, DataPack pack)
 		g_bGravity2[iSurvivor] = false;
 		g_iGravityOwner[iSurvivor] = 0;
 
-		SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+		SetEntityGravity(iSurvivor, 1.0);
 
 		return Plugin_Stop;
 	}
@@ -991,7 +981,7 @@ public Action tTimerStopGravity(Handle timer, DataPack pack)
 	g_bGravity4[iTank] = false;
 	g_iGravityOwner[iSurvivor] = 0;
 
-	SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+	SetEntityGravity(iSurvivor, 1.0);
 
 	int iMessage = pack.ReadCell();
 

addons/sourcemod/scripting/mutant_tanks/mt_heal.sp

@@ -937,8 +937,8 @@ public Action tTimerHeal(Handle timer, DataPack pack)
 				iRealHealth = (iCommonHealth >= 0) ? iExtraHealth : iExtraHealth2;
 			if (iHealth > 500)
 			{
-				//SetEntityHealth(iTank, iRealHealth);
-				SetEntProp(iTank, Prop_Send, "m_iHealth", iRealHealth);
+				SetEntityHealth(iTank, iRealHealth);
+				//SetEntProp(iTank, Prop_Send, "m_iHealth", iRealHealth);
 
 				if (bIsValidGame())
 				{
@@ -970,8 +970,8 @@ public Action tTimerHeal(Handle timer, DataPack pack)
 					iRealHealth = (iSpecialHealth >= 0) ? iExtraHealth : iExtraHealth2;
 				if (iHealth > 500)
 				{
-					//SetEntityHealth(iTank, iRealHealth);
-					SetEntProp(iTank, Prop_Send, "m_iHealth", iRealHealth);
+					SetEntityHealth(iTank, iRealHealth);
+					//SetEntProp(iTank, Prop_Send, "m_iHealth", iRealHealth);
 
 					if (iHealType < 2)
 					{
@@ -1003,8 +1003,8 @@ public Action tTimerHeal(Handle timer, DataPack pack)
 					iRealHealth = (iTankHealth >= 0) ? iExtraHealth : iExtraHealth2;
 				if (iHealth > 500)
 				{
-					//SetEntityHealth(iTank, iRealHealth);
-					SetEntProp(iTank, Prop_Send, "m_iHealth", iRealHealth);
+					SetEntityHealth(iTank, iRealHealth);
+					//SetEntProp(iTank, Prop_Send, "m_iHealth", iRealHealth);
 
 					if (bIsValidGame())
 					{

addons/sourcemod/scripting/mutant_tanks/mt_hypno.sp

@@ -294,13 +294,13 @@ public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &dam
 				{
 					if (g_iHypnoMode[MT_GetTankType(victim)] == 1 && iTarget > 0)
 					{
-						//SetEntityHealth(iTarget, iHealth - RoundToNearest(damage));
-						SetEntProp(iTarget, Prop_Send, "m_iHealth", iHealth - RoundToNearest(damage));
+						SetEntityHealth(iTarget, iHealth - RoundToNearest(damage));
+						//SetEntProp(iTarget, Prop_Send, "m_iHealth", iHealth - RoundToNearest(damage));
 					}
 					else
 					{
-						//SetEntityHealth(attacker, iHealth - RoundToNearest(damage));
-						SetEntProp(attacker, Prop_Send, "m_iHealth", iHealth - RoundToNearest(damage));
+						SetEntityHealth(attacker, iHealth - RoundToNearest(damage));
+						//SetEntProp(attacker, Prop_Send, "m_iHealth", iHealth - RoundToNearest(damage));
 					}
 				}
 				else

addons/sourcemod/scripting/mutant_tanks/mt_leech.sp

@@ -737,10 +737,10 @@ public Action tTimerLeech(Handle timer, DataPack pack)
 
 	int iSurvivorHealth = GetClientHealth(iSurvivor), iTankHealth = GetClientHealth(iTank), iNewHealth = iSurvivorHealth - 1, iNewHealth2 = iTankHealth + 1,
 		iFinalHealth = (iNewHealth < 1) ? 1 : iNewHealth, iFinalHealth2 = (iNewHealth2 > MT_MAXHEALTH) ? MT_MAXHEALTH : iNewHealth2;
-	//SetEntityHealth(iSurvivor, iFinalHealth);
-	SetEntProp(iSurvivor, Prop_Send, "m_iHealth", iFinalHealth);
-	//SetEntityHealth(iTank, iFinalHealth2);
-	SetEntProp(iTank, Prop_Send, "m_iHealth", iFinalHealth2);
+	SetEntityHealth(iSurvivor, iFinalHealth);
+	//SetEntProp(iSurvivor, Prop_Send, "m_iHealth", iFinalHealth);
+	SetEntityHealth(iTank, iFinalHealth2);
+	//SetEntProp(iTank, Prop_Send, "m_iHealth", iFinalHealth2);
 
 	return Plugin_Continue;
 }

addons/sourcemod/scripting/mutant_tanks/mt_medic.sp

@@ -509,8 +509,8 @@ static void vMedicAbility(int tank, bool main)
 								iExtraHealth = (iNewHealth > iGetMaxHealth(tank, iInfected)) ? iGetMaxHealth(tank, iInfected) : iNewHealth,
 								iExtraHealth2 = (iNewHealth < iHealth) ? 1 : iNewHealth,
 								iRealHealth = (iNewHealth >= 0) ? iExtraHealth : iExtraHealth2;
-							//SetEntityHealth(iInfected, iRealHealth);
-							SetEntProp(iInfected, Prop_Send, "m_iHealth", iRealHealth);
+							SetEntityHealth(iInfected, iRealHealth);
+							//SetEntProp(iInfected, Prop_Send, "m_iHealth", iRealHealth);
 						}
 					}
 				}

addons/sourcemod/scripting/mutant_tanks/mt_regen.sp

@@ -578,8 +578,8 @@ public Action tTimerRegen(Handle timer, DataPack pack)
 		iNewHealth2 = (iExtraHealth <= 1) ? iHealth : iExtraHealth,
 		iRealHealth = (g_iRegenHealth[MT_GetTankType(iTank)] >= 1) ? iNewHealth : iNewHealth2,
 		iFinalHealth = (g_iRegenHealth[MT_GetTankType(iTank)] >= 1 && iRealHealth >= g_iRegenLimit[MT_GetTankType(iTank)]) ? g_iRegenLimit[MT_GetTankType(iTank)] : iRealHealth;
-	//SetEntityHealth(iTank, iFinalHealth);
-	SetEntProp(iTank, Prop_Send, "m_iHealth", iFinalHealth);
+	SetEntityHealth(iTank, iFinalHealth);
+	//SetEntProp(iTank, Prop_Send, "m_iHealth", iFinalHealth);
 
 	return Plugin_Continue;
 }

addons/sourcemod/scripting/mutant_tanks/mt_rocket.sp

@@ -56,7 +56,7 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 
 bool g_bCloneInstalled, g_bRocket[MAXPLAYERS + 1], g_bRocket2[MAXPLAYERS + 1], g_bRocket3[MAXPLAYERS + 1], g_bRocket4[MAXPLAYERS + 1], g_bRocket5[MAXPLAYERS + 1];
 
-float g_flHumanCooldown[MT_MAXTYPES + 1], g_flOriginalGravity[MAXPLAYERS + 1], g_flRocketChance[MT_MAXTYPES + 1], g_flRocketDelay[MT_MAXTYPES + 1], g_flRocketRange[MT_MAXTYPES + 1], g_flRocketRangeChance[MT_MAXTYPES + 1];
+float g_flHumanCooldown[MT_MAXTYPES + 1], g_flRocketChance[MT_MAXTYPES + 1], g_flRocketDelay[MT_MAXTYPES + 1], g_flRocketRange[MT_MAXTYPES + 1], g_flRocketRangeChance[MT_MAXTYPES + 1];
 
 int g_iAccessFlags[MT_MAXTYPES + 1], g_iAccessFlags2[MAXPLAYERS + 1], g_iHumanAbility[MT_MAXTYPES + 1], g_iHumanAmmo[MT_MAXTYPES + 1], g_iImmunityFlags[MT_MAXTYPES + 1], g_iImmunityFlags2[MAXPLAYERS + 1], g_iRocketAbility[MT_MAXTYPES + 1], g_iRocketCount[MAXPLAYERS + 1], g_iRocketEffect[MT_MAXTYPES + 1], g_iRocketHit[MT_MAXTYPES + 1], g_iRocketHitMode[MT_MAXTYPES + 1], g_iRocketMessage[MT_MAXTYPES + 1], g_iRocketOwner[MAXPLAYERS + 1], g_iRocketSprite = -1;
 
@@ -364,22 +364,14 @@ public void MT_OnPluginEnd()
 	{
 		if (bIsSurvivor(iSurvivor, MT_CHECK_INGAME|MT_CHECK_ALIVE|MT_CHECK_KICKQUEUE) && g_bRocket[iSurvivor])
 		{
-			SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+			SetEntityGravity(iSurvivor, 1.0);
 		}
 	}
 }
 
 public void MT_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 {
-	if (StrEqual(name, "player_spawn"))
-	{
-		int iSurvivorId = event.GetInt("userid"), iSurvivor = GetClientOfUserId(iSurvivorId);
-		if (bIsSurvivor(iSurvivor, MT_CHECK_INDEX|MT_CHECK_INGAME|MT_CHECK_KICKQUEUE|MT_CHECK_ALIVE))
-		{
-			g_flOriginalGravity[iSurvivor] = GetEntityGravity(iSurvivor);
-		}
-	}
-	else if (StrEqual(name, "player_death"))
+	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
 		if (MT_IsTankSupported(iTank, MT_CHECK_INDEX|MT_CHECK_INGAME|MT_CHECK_KICKQUEUE))
@@ -469,7 +461,7 @@ static void vReset2(int survivor)
 	g_bRocket[survivor] = false;
 	g_iRocketOwner[survivor] = 0;
 
-	SetEntityGravity(survivor, g_flOriginalGravity[survivor]);
+	SetEntityGravity(survivor, 1.0);
 }
 
 static void vReset3(int tank)
@@ -480,7 +472,6 @@ static void vReset3(int tank)
 	g_bRocket4[tank] = false;
 	g_bRocket5[tank] = false;
 	g_iRocketCount[tank] = 0;
-	g_flOriginalGravity[tank] = 1.0;
 }
 
 static void vRocketAbility(int tank)
@@ -778,7 +769,6 @@ public Action tTimerRocketLaunch(Handle timer, DataPack pack)
 	EmitSoundToAll(SOUND_LAUNCH, iSurvivor, _, _, _, 1.0);
 
 	TeleportEntity(iSurvivor, NULL_VECTOR, NULL_VECTOR, flVelocity);
-	g_flOriginalGravity[iSurvivor] = GetEntityGravity(iSurvivor);
 	SetEntityGravity(iSurvivor, 0.1);
 
 	return Plugin_Continue;
@@ -814,7 +804,7 @@ public Action tTimerRocketDetonate(Handle timer, DataPack pack)
 	TE_SendToAll();
 
 	ForcePlayerSuicide(iSurvivor);
-	SetEntityGravity(iSurvivor, g_flOriginalGravity[iSurvivor]);
+	SetEntityGravity(iSurvivor, 1.0);
 
 	int iMessage = pack.ReadCell();
 	if (g_iRocketMessage[MT_GetTankType(iTank)] & iMessage)

addons/sourcemod/scripting/mutant_tanks/mt_ultimate.sp

@@ -496,8 +496,8 @@ static void vUltimateAbility(int tank)
 				EmitSoundToAll(SOUND_GROWL1, tank);
 			}
 
- 			//SetEntityHealth(tank, RoundToNearest(g_iUltimateHealth[tank] * g_flUltimateHealthPortion[MT_GetTankType(tank)]));
-			SetEntProp(tank, Prop_Send, "m_iHealth", RoundToNearest(g_iUltimateHealth[tank] * g_flUltimateHealthPortion[MT_GetTankType(tank)]));
+ 			SetEntityHealth(tank, RoundToNearest(g_iUltimateHealth[tank] * g_flUltimateHealthPortion[MT_GetTankType(tank)]));
+			//SetEntProp(tank, Prop_Send, "m_iHealth", RoundToNearest(g_iUltimateHealth[tank] * g_flUltimateHealthPortion[MT_GetTankType(tank)]));
 			SetEntProp(tank, Prop_Data, "m_takedamage", 0, 1);
 
 			CreateTimer(g_flUltimateDuration[MT_GetTankType(tank)], tTimerStopUltimate, GetClientUserId(tank), TIMER_FLAG_NO_MAPCHANGE);

addons/sourcemod/scripting/mutant_tanks/mt_undead.sp

@@ -250,8 +250,8 @@ public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &dam
 			{
 				g_bUndead[victim] = false;
 
-				//SetEntityHealth(victim, g_iUndeadHealth[victim]);
-				SetEntProp(victim, Prop_Send, "m_iHealth", g_iUndeadHealth[victim]);
+				SetEntityHealth(victim, g_iUndeadHealth[victim]);
+				//SetEntProp(victim, Prop_Send, "m_iHealth", g_iUndeadHealth[victim]);
 
 				if (MT_IsTankSupported(victim, MT_CHECK_FAKECLIENT) && g_iHumanAbility[MT_GetTankType(victim)] == 1 && !g_bUndead2[victim])
 				{

addons/sourcemod/scripting/mutant_tanks/mt_vampire.sp

@@ -221,8 +221,8 @@ public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &dam
 				{
 					int iDamage = RoundToNearest(damage), iHealth = GetClientHealth(attacker), iNewHealth = iHealth + iDamage,
 						iFinalHealth = (iNewHealth > MT_MAXHEALTH) ? MT_MAXHEALTH : iNewHealth;
-					//SetEntityHealth(attacker, iFinalHealth);
-					SetEntProp(attacker, Prop_Send, "m_iHealth", iFinalHealth);
+					SetEntityHealth(attacker, iFinalHealth);
+					//SetEntProp(attacker, Prop_Send, "m_iHealth", iFinalHealth);
 
 					vEffect(victim, attacker, g_iVampireEffect[MT_GetTankType(attacker)], 1);
 

addons/sourcemod/scripting/mutant_tanks/mt_whirl.sp

@@ -773,7 +773,10 @@ public Action tTimerWhirl(Handle timer, DataPack pack)
 		g_bWhirl[iSurvivor] = false;
 		g_iWhirlOwner[iSurvivor] = 0;
 
-		SetClientViewEntity(iSurvivor, iSurvivor);
+		if (bIsHumanSurvivor(iSurvivor))
+		{
+			SetClientViewEntity(iSurvivor, iSurvivor);
+		}
 
 		return Plugin_Stop;
 	}

addons/sourcemod/scripting/mutant_tanks/mt_xiphos.sp

@@ -221,8 +221,8 @@ public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &dam
 				{
 					int iDamage = RoundToNearest(damage), iHealth = GetClientHealth(attacker), iNewHealth = iHealth + iDamage,
 						iFinalHealth = (iNewHealth > MT_MAXHEALTH) ? MT_MAXHEALTH : iNewHealth;
-					//SetEntityHealth(attacker, iFinalHealth);
-					SetEntProp(attacker, Prop_Send, "m_iHealth", iFinalHealth);
+					SetEntityHealth(attacker, iFinalHealth);
+					//SetEntProp(attacker, Prop_Send, "m_iHealth", iFinalHealth);
 
 					vEffect(victim, attacker, g_iXiphosEffect[MT_GetTankType(attacker)], 1);