mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Added code protecting against obscure merges of invalid zones.
- Usually happened when welding fuel tanks caused secondary explosions.
This commit is contained in:
@@ -143,6 +143,9 @@ Class Procs:
|
|||||||
. = ..()
|
. = ..()
|
||||||
|
|
||||||
/connection_edge/zone/tick()
|
/connection_edge/zone/tick()
|
||||||
|
if(A.invalid || B.invalid)
|
||||||
|
erase()
|
||||||
|
return
|
||||||
//world << "[id]: Tick [air_master.current_cycle]: \..."
|
//world << "[id]: Tick [air_master.current_cycle]: \..."
|
||||||
if(direct)
|
if(direct)
|
||||||
if(air_master.equivalent_pressure(A, B))
|
if(air_master.equivalent_pressure(A, B))
|
||||||
@@ -207,6 +210,9 @@ Class Procs:
|
|||||||
return A == Z
|
return A == Z
|
||||||
|
|
||||||
/connection_edge/unsimulated/tick()
|
/connection_edge/unsimulated/tick()
|
||||||
|
if(A.invalid)
|
||||||
|
erase()
|
||||||
|
return
|
||||||
//world << "[id]: Tick [air_master.current_cycle]: To [B]!"
|
//world << "[id]: Tick [air_master.current_cycle]: To [B]!"
|
||||||
//A.air.mimic(B, coefficient)
|
//A.air.mimic(B, coefficient)
|
||||||
ShareSpace(A.air,air)
|
ShareSpace(A.air,air)
|
||||||
|
|||||||
@@ -220,6 +220,8 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
|
|||||||
#ifdef ZASDBG
|
#ifdef ZASDBG
|
||||||
ASSERT(istype(A))
|
ASSERT(istype(A))
|
||||||
ASSERT(istype(B))
|
ASSERT(istype(B))
|
||||||
|
ASSERT(!A.invalid)
|
||||||
|
ASSERT(!B.invalid)
|
||||||
ASSERT(A != B)
|
ASSERT(A != B)
|
||||||
#endif
|
#endif
|
||||||
if(A.contents.len < B.contents.len)
|
if(A.contents.len < B.contents.len)
|
||||||
@@ -234,6 +236,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
|
|||||||
ASSERT(istype(A))
|
ASSERT(istype(A))
|
||||||
ASSERT(isturf(B))
|
ASSERT(isturf(B))
|
||||||
ASSERT(A.zone)
|
ASSERT(A.zone)
|
||||||
|
ASSERT(!A.zone.invalid)
|
||||||
//ASSERT(B.zone)
|
//ASSERT(B.zone)
|
||||||
ASSERT(A != B)
|
ASSERT(A != B)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user