mirror of
https://github.com/JonnyBro/beatrun.git
synced 2024-12-28 12:53:02 +05:00
hacky player damage fix
This commit is contained in:
parent
6abc1fe00d
commit
b8459ff666
1 changed files with 15 additions and 10 deletions
|
@ -302,21 +302,26 @@ end)
|
|||
|
||||
hook.Add("ShouldCollide", "NoPlayerCollisions", function(ent1, ent2)
|
||||
if ent1:IsPlayer() and (ent2:IsPlayer() or ent2.NoPlayerCollisions) then
|
||||
if ent2.BRCollisionFunc then return ent2:BRCollisionFunc(ent1)
|
||||
else return false end
|
||||
if ent2.BRCollisionFunc then
|
||||
return ent2:BRCollisionFunc(ent1)
|
||||
else
|
||||
if ent1.br_Fired or ent2.br_Fired then
|
||||
return true
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
-- if ent1:IsPlayer() and (ent2:IsPlayer() or ent2.NoPlayerCollisions) then
|
||||
-- if ent2.BRCollisionFunc then
|
||||
-- return ent2:BRCollisionFunc(ent1)
|
||||
-- else
|
||||
-- return false
|
||||
-- end
|
||||
-- end
|
||||
|
||||
if ent2:IsPlayer() and ent1:IsNPC() then return true end
|
||||
end)
|
||||
|
||||
// i was forced
|
||||
hook.Add("EntityFireBullets", "thisengineismadebyacrackhead", function(ent, data)
|
||||
ent.br_Fired = true
|
||||
timer.Simple(engine.TickInterval()*2, function() if IsValid(ent) then ent.br_Fired = false end end)
|
||||
end)
|
||||
|
||||
hook.Add("PhysgunPickup", "AllowPlayerPickup", function(ply, ent)
|
||||
if ply:IsSuperAdmin() and ent:IsPlayer() then return true end
|
||||
end)
|
||||
|
|
Loading…
Reference in a new issue