Added 'Effects.RemoveAll' function & added loose all effects on death hook

master
AlmTech Software 5 years ago
parent 9496a48d4a
commit 9351395981
  1. 29
      gamemode/engine/lib/sh_effects.lua

@ -63,17 +63,32 @@ if SERVER then -- server only functions
end end
end end
function Quantum.Effect.Remove( pl, effectid ) hook.Add( "PlayerDisconnected", "Quantum_Effects_RemoveHooksOnDisconnect", function( ply )
Quantum.Effect.RemoveAllRuntimeFunctions( ply )
end)
function Quantum.Effect.Remove( pl, effectid, character )
local effectTbl = Quantum.Effect.Get( effectid ) local effectTbl = Quantum.Effect.Get( effectid )
local char = Quantum.Server.Char.GetCurrentCharacter( pl ) local char = character || Quantum.Server.Char.GetCurrentCharacter( pl )
if( effectTbl != nil ) then if( effectTbl != nil ) then
Quantum.Effect.RemoveRuntimeFunction( pl, effectid ) Quantum.Effect.RemoveRuntimeFunction( pl, effectid )
pl.effects[effectid] = nil char.effects[effectid] = nil
effectTbl.func.stop( pl ) -- run the end function effectTbl.func.stop( pl ) -- run the end function
end end
end end
function Quantum.Effects.RemoveAll( pl )
local char = Quantum.Server.Char.GetCurrentCharacter( pl )
if( char.effects != nil ) then
Quantum.Debug( "Removing all " .. tostring(pl) .. " effects." )
for i, effect in pairs( char.effects ) do
Quantum.Effect.Remove( pl, effect, char ) -- remove the effect
end
end
end
function Quantum.Effect.Give( pl, effectid ) function Quantum.Effect.Give( pl, effectid )
local effectTbl = Quantum.Effect.Get( effectid ) local effectTbl = Quantum.Effect.Get( effectid )
local char = Quantum.Server.Char.GetCurrentCharacter( pl ) local char = Quantum.Server.Char.GetCurrentCharacter( pl )
@ -92,7 +107,13 @@ if SERVER then -- server only functions
Quantum.Effect.Remove( pl, effectid ) -- remove the effect from the player after its duration is over Quantum.Effect.Remove( pl, effectid ) -- remove the effect from the player after its duration is over
end) end)
end end
char.effects[ #char.effects + 1 ] = effectid -- add it to the effect table so that we can remove it later
end end
end end
hook.Add( "PlayerDeath", "Quantum_Effects_LooseOnDeath", function( ply )
Quantum.Effects.RemoveAll( ply ) -- remove all effects
end)
end end
Loading…
Cancel
Save