From: Mario <mario.mario@y7mail.com>
Date: Wed, 23 Nov 2022 00:41:18 +0000 (+1000)
Subject: Set the entity's origin to the trace position before moving it out of solid
X-Git-Tag: xonotic-v0.8.6~275^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=906da9f1dc27307fbe26c0c3ea7ce67c2a979be0;p=xonotic%2Fxonotic-data.pk3dir.git

Set the entity's origin to the trace position before moving it out of solid
---

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 4cba5f102..fd3b5b08d 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -2279,9 +2279,9 @@ void DropToFloor_Handler(entity this)
 		else if(trace_fraction < 1)
 		{
 			LOG_DEBUGF("DropToFloor_Handler: %v fixed badly placed entity", this.origin);
+			setorigin(this, trace_endpos);
 			if(autocvar_sv_gameplayfix_droptofloorstartsolid_nudgetocorrect)
 				move_out_of_solid(this);
-			setorigin(this, trace_endpos);
 			SET_ONGROUND(this);
 			this.groundentity = trace_ent;
 			// if support is destroyed, keep suspended (gross hack for floating items in various maps)