jonny_bro/beatrun
1
0
Fork 0
mirror of https://github.com/JonnyBro/beatrun.git synced 2024-12-29 21:33:02 +05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6 from jeffthekillerz/master

Browse source 
Will remake later?
This commit is contained in:
Nikita 2023-06-03 20:50:09 +05:00 committed by GitHub
commit 75198f56f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
beatrun/gamemodes/beatrun/gamemode/player_class/player_beatrun.lua
View file

@ -302,21 +302,26 @@ end)
hook.Add("ShouldCollide", "NoPlayerCollisions", function(ent1, ent2) hook.Add("ShouldCollide", "NoPlayerCollisions", function(ent1, ent2)
if ent1:IsPlayer() and (ent2:IsPlayer() or ent2.NoPlayerCollisions) then if ent1:IsPlayer() and (ent2:IsPlayer() or ent2.NoPlayerCollisions) then
if ent2.BRCollisionFunc then return ent2:BRCollisionFunc(ent1) if ent2.BRCollisionFunc then
else return false end return ent2:BRCollisionFunc(ent1)
else
if ent1.br_Fired or ent2.br_Fired then
return true
end
return false
end
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 if ent2:IsPlayer() and ent1:IsNPC() then return true end
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) hook.Add("PhysgunPickup", "AllowPlayerPickup", function(ply, ent)
if ply:IsSuperAdmin() and ent:IsPlayer() then return true end if ply:IsSuperAdmin() and ent:IsPlayer() then return true end
end) end)