Makes jaunting work properly again (#56028)

Fixes an if check that was checking the area flags of a turf. Prevents a runtime in phased_check, and makes the area noteleport flag work properly. These were introduced by #55973
This commit is contained in:
LemonInTheDark
2021-01-12 00:16:12 -03:00
committed by GitHub
parent 19cbbd1c0c
commit 8045e45e85
+6 -2
View File
@@ -10,7 +10,10 @@
/obj/effect/dummy/phased_mob/Destroy()
// Eject contents if deleted somehow
var/area/destination_area = get_turf(src)
var/atom/dest = drop_location()
if(!dest) //You're in nullspace you clown
return ..()
var/area/destination_area = get_area(dest)
var/failed_areacheck = FALSE
if(destination_area.area_flags & NOTELEPORT)
failed_areacheck = TRUE
@@ -47,15 +50,16 @@
if (movedelay > world.time || !direction)
return
var/turf/newloc = get_step(src,direction)
var/area/destination_area = newloc.loc
if(!newloc)
return
var/area/destination_area = newloc.loc
movedelay = world.time + movespeed
if(newloc.flags_1 & NOJAUNT_1)
to_chat(user, "<span class='warning'>Some strange aura is blocking the way.</span>")
return
if(destination_area.area_flags & NOTELEPORT)
to_chat(user, "<span class='danger'>Some dull, universal force is blocking the way. It's overwhelmingly oppressive force feels dangerous.</span>")
return
return newloc
/// React to signals by deleting the effect. Used for bloodcrawl.