From a4aa5e578c9ec563d9291851a5516626e171446c Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Sat, 15 Apr 2023 17:24:29 -0700
Subject: [PATCH] trigger_teleport: When teleporting, use setorigin_safe() to
 guarantee our target pos is not inside the floor (fixes some teleporters in
 DMC)

---
 src/gs-entbase/server/trigger_teleport.qc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gs-entbase/server/trigger_teleport.qc b/src/gs-entbase/server/trigger_teleport.qc
index f0738c0a..fc9fa67e 100644
--- a/src/gs-entbase/server/trigger_teleport.qc
+++ b/src/gs-entbase/server/trigger_teleport.qc
@@ -69,7 +69,7 @@ trigger_teleport::Touch(entity eToucher)
 
 		if (eTarget) {
 			vector endpos = eTarget.origin + [0,0,16];
-			setorigin(eToucher, endpos);
+			setorigin_safe(eToucher, endpos);
 			NSLog("^2trigger_teleport::^3Touch^7: Teleported '%s' to `%v`", 
 				eToucher.netname, endpos);
 		} else {