mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Adds some safeties to ensure that hotspots don't cause an infinite infectious runtime and crash clients (#94698)
## About The Pull Request Not 100% sure, but somehow we ended up with a missing hot group on Terry which caused newer hotspots to runtime and not get theirs which caused more hotspots- you get it. Only idea I have is that possibly we could've gotten a hard delete, but there are none in the logs? This should solve the infinite hotspot runtimes at the very least, and possibly? prevent harddels by changing the nullcheck to a qdel check. ## Changelog 🆑 fix: Added some safeties to ensure that hotspots don't cause an infinite infectious runtime and crash clients /🆑
This commit is contained in:
@@ -115,12 +115,15 @@
|
||||
if(!to_check.active_hotspot)
|
||||
continue
|
||||
var/obj/effect/hotspot/enemy_spot = to_check.active_hotspot
|
||||
// Safeguard to prevent infectious init runtimes for hotspots if we somehow end up with a hotspot without a group
|
||||
if(!enemy_spot.our_hot_group)
|
||||
continue
|
||||
if(!our_hot_group)
|
||||
enemy_spot.our_hot_group.add_to_group(src)
|
||||
else if(our_hot_group != enemy_spot.our_hot_group && enemy_spot.our_hot_group) //if we belongs to a hot group from prior loop and we encounter another hot spot with a group then we merge
|
||||
else if(our_hot_group != enemy_spot.our_hot_group) //if we belongs to a hot group from prior loop and we encounter another hot spot with a group then we merge
|
||||
our_hot_group.merge_hot_groups(enemy_spot.our_hot_group)
|
||||
|
||||
if(!our_hot_group)//if after loop through all the adjacents turfs and we havent belong to a group yet, make our own
|
||||
if(QDELETED(our_hot_group))//if after loop through all the adjacents turfs and we havent belong to a group yet, make our own
|
||||
our_hot_group = new
|
||||
our_hot_group.add_to_group(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user