From 33c492ae4ce58614994a3f5ca95d2b32605912f1 Mon Sep 17 00:00:00 2001
From: ESwordTheCat <ESwordTheCat@plea.se>
Date: Tue, 29 Apr 2014 10:25:28 -0800
Subject: [PATCH] Fixed all the runtimes.

---
 code/__HELPERS/experimental.dm               | 5 ++---
 code/modules/projectiles/projectile.dm       | 4 +++-
 code/modules/projectiles/projectile/beams.dm | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/__HELPERS/experimental.dm b/code/__HELPERS/experimental.dm
index d9e7cb1e960..dce1fb73a34 100644
--- a/code/__HELPERS/experimental.dm
+++ b/code/__HELPERS/experimental.dm
@@ -48,7 +48,7 @@
  * WARNING, only supports /mob and /obj.
  */
 
-#define DEBUG_OBJECT_POOL 0
+#define DEBUG_OBJECT_POOL 1
 #define MAINTAINING_OBJECT_POOL_COUNT 20
 
 var/list/masterPool = list()
@@ -100,11 +100,10 @@ var/list/masterPool = list()
 
 	if (isnull(masterPool[Object.type]))
 		#if DEBUG_OBJECT_POOL
-		world << "DEBUG_OBJECT_POOL: [Object.type] pool is empty, recreating list."
+		world << "DEBUG_OBJECT_POOL: [Object.type] pool is empty, recreating pool."
 		#endif
 
 		masterPool[Object.type] = list()
-	// A way to limit
 	else if (length(masterPool[Object.type]) > MAINTAINING_OBJECT_POOL_COUNT)
 		#if DEBUG_OBJECT_POOL
 		world << "DEBUG_OBJECT_POOL: returnToPool([Object.type]) exceeds [num2text(MAINTAINING_OBJECT_POOL_COUNT)] discarding..."
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 6cf9a8f985a..f27e0ed0f3e 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -110,7 +110,7 @@
 
 	Bump(atom/A as mob|obj|turf|area)
 		if(A == firer)
-			loc = A.loc
+			//loc = A.loc
 			return 0 //cannot shoot yourself
 
 		if(bumped)	return 0
@@ -182,6 +182,7 @@
 			if(!istype(src, /obj/item/projectile/beam/lightning))
 				density = 0
 				invisibility = 101
+			//del(src)
 			returnToPool(src)
 		return 1
 
@@ -199,6 +200,7 @@
 		if(kill_count < 1)
 			//del(src)
 			returnToPool(src)
+			return
 		kill_count--
 		spawn while(src)
 			if((!( current ) || loc == current))
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 8dac1d9bafd..9ccefe1a993 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -206,6 +206,9 @@ var/list/beam_master = list()
 				return
 			step_towards(src, current) //Move~
 
+			if (isnull(loc))
+				return
+
 			if(kill_count < 1)
 				//del(src)
 				returnToPool(src)