cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14329 from KazeEspada/Mobfix1pointO

Browse Source 
Fixes a runtime involving mobs that get deleted upon death.
This commit is contained in:
duncathan salt
2016-01-04 20:28:52 +01:00
parent e79f214d58 aec7bd9301
commit 5edf9f87e1
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_movement.dm
+8 -7
View File
@@ -160,13 +160,14 @@
if(M)
if ((get_dist(mob, M) <= 1 || M.loc == mob.loc))
. = ..()
if (isturf(M.loc))
var/diag = get_dir(mob, M)
if ((diag - 1) & diag)
else
diag = null
if ((get_dist(mob, M) > 1 || diag))
step(M, get_dir(M.loc, mob.loc))
if(M)//Mob may get deleted during parent call
if (isturf(M.loc))
var/diag = get_dir(mob, M)
if ((diag - 1) & diag)
else
diag = null
if ((get_dist(mob, M) > 1 || diag))
step(M, get_dir(M.loc, mob.loc))
else
for(var/mob/M in L)
M.other_mobs = 1