Merge pull request #3098 from Leshana/mob-controller-runtime

Fix runtimes in controllers
This commit is contained in:
Neerti
2017-03-18 22:27:13 -04:00
committed by GitHub
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -14,7 +14,7 @@
/datum/controller/process/mob/doWork()
for(last_object in mob_list)
var/mob/M = last_object
if(isnull(M.gcDestroyed))
if(M && isnull(M.gcDestroyed))
try
M.Life()
catch(var/exception/e)
+1 -1
View File
@@ -11,7 +11,7 @@
/datum/controller/process/obj/doWork()
for(last_object in processing_objects)
var/datum/O = last_object
if(isnull(O.gcDestroyed))
if(O && isnull(O.gcDestroyed))
try
O:process()
catch(var/exception/e)
+1 -1
View File
@@ -341,7 +341,7 @@
if ((stat != 2 || !( ticker )))
usr << "<span class='notice'><B>You must be dead to use this!</B></span>"
return
if (ticker.mode.deny_respawn) //BS12 EDIT
if (ticker.mode && ticker.mode.deny_respawn) //BS12 EDIT
usr << "<span class='notice'>Respawn is disabled for this roundtype.</span>"
return
else