Merged FPP

FPtje · Oct 19, 2024 · ec7cb97 · ec7cb97
1 parent aec6a68
commit ec7cb97
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/gamemode/modules/fpp/pp/server/antispam.lua b/gamemode/modules/fpp/pp/server/antispam.lua
@@ -4,9 +4,9 @@ FPP.AntiSpam = FPP.AntiSpam or {}
 function FPP.AntiSpam.GhostFreeze(ent, phys)
     ent:SetRenderMode(RENDERMODE_TRANSCOLOR)
     ent:DrawShadow(false)
-    ent.OldColor = ent.OldColor or ent:GetColor()
+    ent.FPPOldColor = ent.FPPOldColor or ent:GetColor()
     ent.StartPos = ent:GetPos()
-    ent:SetColor(Color(ent.OldColor.r, ent.OldColor.g, ent.OldColor.b, ent.OldColor.a - 155))
+    ent:SetColor(Color(ent.FPPOldColor.r, ent.FPPOldColor.g, ent.FPPOldColor.b, ent.FPPOldColor.a - 155))
 
     ent:SetCollisionGroup(COLLISION_GROUP_WORLD)
     ent.CollisionGroup = COLLISION_GROUP_WORLD
@@ -23,10 +23,10 @@ function FPP.UnGhost(ply, ent)
         ent:DrawShadow(true)
         if ent.OldCollisionGroup then ent:SetCollisionGroup(ent.OldCollisionGroup) ent.OldCollisionGroup = nil end
 
-        if ent.OldColor then
-            ent:SetColor(Color(ent.OldColor.r, ent.OldColor.g, ent.OldColor.b, ent.OldColor.a))
+        if ent.FPPOldColor then
+            ent:SetColor(Color(ent.FPPOldColor.r, ent.FPPOldColor.g, ent.FPPOldColor.b, ent.FPPOldColor.a))
         end
-        ent.OldColor = nil
+        ent.FPPOldColor = nil
 
 
         ent:SetCollisionGroup(COLLISION_GROUP_NONE)