Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Fixes spurious runtime caused by icemoon (again) (#…
Browse files Browse the repository at this point in the history
…1923)

* [NO GBP] Fixes spurious runtime caused by icemoon (again) (#82582)

tgstation/tgstation#82572 I tried to fix this
but there was an unaccounted race condition which just caused a separate
runtime...

![firefox_GxGibAO281](https://github.com/tgstation/tgstation/assets/13398309/f251aecc-ef17-4bae-a741-5aade40de423)

Since the type is being changed mid-execution `replacement_turf` will
become out of scope. My bad--this should fix it now for good.

* [NO GBP] Fixes spurious runtime caused by icemoon (again)

---------

Co-authored-by: Bloop <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Apr 11, 2024
1 parent 5ced4bd commit 73e160b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions code/game/turfs/open/openspace.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,13 @@
if(!T)
return
if(T.turf_flags & NO_RUINS && protect_ruin)
<<<<<<< HEAD

Check failure on line 191 in code/game/turfs/open/openspace.dm

View workflow job for this annotation

GitHub Actions / Run Linters

got '<<', expected one of: newline, '/', identifier
ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR)
=======
var/turf/newturf = ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR)
if(!isopenspaceturf(newturf)) // only openspace turfs should be returning INITIALIZE_HINT_LATELOAD
return INITIALIZE_HINT_NORMAL
>>>>>>> d8c2c7cb582 ([MIRROR] [NO GBP] Fixes spurious runtime caused by icemoon (again) (#1923))
return
if(!ismineralturf(T) || !drill_below)
return
Expand Down

0 comments on commit 73e160b

Please sign in to comment.