From 9e77aca051b077bb54ec49f5e8f3d30223994e64 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sat, 30 May 2020 21:22:47 -0700
Subject: [PATCH] Merge pull request #7243 from Mechoid/BlobLoop

Blob Infinite Loop Fix
---
 code/modules/blob2/core_chunk.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 8a5795aae93..7d8f588568e 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -61,12 +61,13 @@
 
 /obj/item/weapon/blobcore_chunk/proc/get_carrier(var/atom/target)
 	var/atom/A = target ? target.loc : src
-	if(!istype(A, /mob/living))
-		A = get_carrier(A)
 
 	if(isturf(A) || isarea(A))	// Something has gone horribly wrong if the second is true.
 		return FALSE	// No mob is carrying us.
 
+	if(!istype(A, /mob/living))
+		A = get_carrier(A)
+
 	return A
 
 /obj/item/weapon/blobcore_chunk/blob_act(obj/structure/blob/B)