rain-plus/zombiesurvival-evolved
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: rain-plus:764bb94570fddfa5b6876339d31163d4ef21bc98
Branches Tags
rain-plus:master
rain-plus:multithread
...
compare: rain-plus:690035b3dda198e80ba9a0f3b8118eb4dfeae046
Branches Tags
rain-plus:multithread
rain-plus:master

2 commits
764bb94570 ... 690035b3dd

Author SHA1 Message Date
YUCLing
690035b3dd
mod: simplify player ShouldNotCollide 2022-07-17 20:46:55 +08:00
YUCLing
327f686f62
fix: typo 2022-07-14 18:05:29 +08:00
2 changed files with 2 additions and 6 deletions
Show stats Expand all files Collapse all files

6
gamemodes/zombiesurvival/gamemode/obj_player_extend.lua
View file

@ -652,11 +652,7 @@ end
function meta:ShouldNotCollide(ent) function meta:ShouldNotCollide(ent)
if E_IsValid(ent) then if E_IsValid(ent) then
if getmetatable(ent) == meta then if getmetatable(ent) == meta then
if P_Team(self) == P_Team(ent) or E_GetTable(self).NoCollideAll or E_GetTable(ent).NoCollideAll then return P_Team(self) == P_Team(ent) or E_GetTable(self).NoCollideAll or E_GetTable(ent).NoCollideAll
return true
end
return false
end end
return E_GetDTBool(self, 0) and ent:IsBarricadeProp() return E_GetDTBool(self, 0) and ent:IsBarricadeProp()

2
gamemodes/zombiesurvival/scripting and addons.txt
View file

@ -75,7 +75,7 @@ Hook. Human kills a zombie.
GM:HumanKilledZombie(Player victim, Player attacker, DamageInfo dmginfo, Bool headshot, Bool wassuicide) GM:HumanKilledZombie(Player victim, Player attacker, DamageInfo dmginfo, Bool headshot, Bool wassuicide)
Hook. Zombie kills a human. Hook. Zombie kills a human.
GM:HumanKilledZombie(Player victim, Player attacker, DamageInfo dmginfo, Bool headshot, Bool wassuicide) GM:ZombieKilledHuman(Player victim, Player attacker, DamageInfo dmginfo, Bool headshot, Bool wassuicide)
SELF-EXPLANATORY HOOKS AND FUNCTIONS SELF-EXPLANATORY HOOKS AND FUNCTIONS
GM:LoadMapEditorFile() GM:LoadMapEditorFile()