running a test: demodularizes mana_pool destroy.

MrMelbert · Nov 20, 2024 · 612c7a5 · 612c7a5
1 parent cc7885e
commit 612c7a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
@@ -245,6 +245,8 @@
 	if (length(vis_contents))
 		vis_contents.Cut()
 
+	QDEL_NULL(mana_pool) // MAJOR NON-MODULE CHANGE
+
 /atom/movable/proc/update_emissive_block()
 	// This one is incredible.
 	// `if (x) else { /* code */ }` is surprisingly fast, and it's faster than a switch, which is seemingly not a jump table.

diff --git a/maplestation_modules/code/modules/magic/mana/mana.dm b/maplestation_modules/code/modules/magic/mana/mana.dm
@@ -7,12 +7,12 @@
 
 	var/mana_overloaded = FALSE
 
-/atom/movable/Destroy(force, ...)
+/* /atom/movable/Destroy(force, ...)
 
 	QDEL_NULL(mana_pool) // why was this after set_mana_pool. it should never ever be
 	set_mana_pool(null)
 
-	return ..()
+	return ..() */
 
 // creates the mana pool for use.
 // mostly called on atom_init.