From 2a53ebb6b9329c57080a7173983e5008d2e14c2f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 20 Dec 2014 14:48:22 +0100
Subject: [PATCH] - fixed state checking in A_Teleport.

---
 src/thingdef/thingdef_codeptr.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 44e993f34..98451795b 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -4246,17 +4246,16 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
 
 		if (!(Flags & TF_NOJUMP))
 		{
+			ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!
 			if (TeleportState == NULL)
 			{
-				ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!
 				// Default to Teleport.
 				TeleportState = self->FindState("Teleport");
 				// If still nothing, then return.
 				if (!TeleportState) return;
-
-				ACTION_JUMP(TeleportState);
-				return;
 			}
+			ACTION_JUMP(TeleportState);
+			return;
 		}
 	}
 	ACTION_SET_RESULT(teleResult);