Updated for SMod 3.8.2

Rnen · Jul 27, 2020 · bea5aa1 · bea5aa1
1 parent bbe9622
commit bea5aa1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/AdminToolbox/AdminToolbox/API/Utility.cs b/AdminToolbox/AdminToolbox/API/Utility.cs
@@ -105,8 +105,8 @@ public static readonly int[]
 				(int)DamageType.E11_STANDARD_RIFLE,
 				(int)DamageType.P90,
 				(int)DamageType.MP7,
-				(int)DamageType.LOGICER,
-				(int)DamageType.FRAG
+				(int)DamageType.LOGICIER,
+				(int)DamageType.GRENADE
 			},
 			ScpDamagesTypes = {
 				(int)DamageType.SCP_049,
@@ -125,7 +125,7 @@ public static readonly int[]
 				(int)Team.CDP
 			};
 
-		public static readonly DamageType Human = DamageType.COM15 | DamageType.E11_STANDARD_RIFLE | DamageType.P90 | DamageType.MP7 | DamageType.LOGICER | DamageType.FRAG;
+		public static readonly DamageType Human = DamageType.COM15 | DamageType.E11_STANDARD_RIFLE | DamageType.P90 | DamageType.MP7 | DamageType.LOGICIER | DamageType.GRENADE;
 		public static readonly DamageType SCP = DamageType.SCP_049 | DamageType.SCP_049_2 | DamageType.SCP_096 | DamageType.SCP_106 | DamageType.SCP_173 | DamageType.SCP_939;
 
 

diff --git a/AdminToolbox/AdminToolbox/AdminToolbox.cs b/AdminToolbox/AdminToolbox/AdminToolbox.cs
@@ -24,12 +24,12 @@ namespace AdminToolbox
 		version = AT_Version + "-" + AT_Revision,
 		SmodMajor = 3,
 		SmodMinor = 8,
-		SmodRevision = 1
+		SmodRevision = 2
 		)]
 	public class AdminToolbox : Plugin
 	{
 		internal const string AT_Version = "1.3.8";
-		internal const string AT_Revision = "16";
+		internal const string AT_Revision = "17";
 
 		#region GitHub release info
 		private DateTime LastOnlineCheck = DateTime.Now;

diff --git a/AdminToolbox/AdminToolbox/Events/PlayerDamageEvent.cs b/AdminToolbox/AdminToolbox/Events/PlayerDamageEvent.cs
@@ -71,7 +71,7 @@ public void OnPlayerHurt(PlayerHurtEvent ev)
 				ev.Damage = 0f;
 			else if ((attackerSetting?.isJailed ?? false) || (attackerSetting?.dmgOff ?? false))
 				ev.Damage = 0f;
-			else if (ev.DamageType == DamageType.FLYING && Config.GetBoolValue("admintoolbox_antifly_disable", false))
+			else if (ev.DamageType == DamageType.FLYING_DETECTION && Config.GetBoolValue("admintoolbox_antifly_disable", false))
 				ev.Damage = 0f;
 
 
@@ -87,7 +87,7 @@ public void OnPlayerHurt(PlayerHurtEvent ev)
 				roleDamages[0] = _roleDamagesDefault;
 
 
-			if (ev.DamageType != DamageType.FRAG && (attackerSetting?.instantKill ?? false))
+			if (ev.DamageType != DamageType.GRENADE && (attackerSetting?.instantKill ?? false))
 				ev.Damage = ev.Player.GetHealth() + 1;
 
 			if (ev.Player.IsHandcuffed() && Utility.HumanDamageTypes.Contains((int)ev.DamageType) && Config.GetBoolValue("admintoolbox_nokill_captured", false))
@@ -224,7 +224,7 @@ public void OnPlayerDie(PlayerDeathEvent ev)
 						return;
 					if (Utility.IsTeam(ev.Player, ev.Killer))
 					{
-						string keyWord = (ev.DamageTypeVar == DamageType.FRAG) ? "granaded" : "killed";
+						string keyWord = (ev.DamageTypeVar == DamageType.GRENADE) ? "granaded" : "killed";
 						if (killerSetting != null && ev.Killer.PlayerId != ev.Player.PlayerId) killerSetting.PlayerStats.TeamKills++;
 						if (Config.GetBoolValue("admintoolbox_debug_friendly_kill", true, false))
 							if (AdminToolbox.isColored)