Merge pull request #1086 from Mr-Gash/master

TTT: Fixed instant defusal exploit
Facepunch · Oct 19, 2015 · 91ab0e6 · 91ab0e6
2 parents fc93bce + 9b69b98
commit 91ab0e6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/garrysmod/gamemodes/terrortown/entities/entities/ttt_c4/shared.lua b/garrysmod/gamemodes/terrortown/entities/entities/ttt_c4/shared.lua
@@ -507,7 +507,7 @@ if SERVER then
       if not idx or not wire then return end
 
       local bomb = ents.GetByIndex(idx)
-      if IsValid(bomb) and bomb:GetArmed() then
+      if IsValid(bomb) and bomb:GetClass() == "ttt_c4" and not bomb.DisarmCausedExplosion and bomb:GetArmed() then
          if bomb:GetPos():Distance(ply:GetPos()) > 256 then
             return
          elseif bomb.SafeWires[wire] or ply:IsTraitor() or ply == bomb:GetOwner() then