From: Mario <mario.mario@y7mail.com>
Date: Mon, 28 Nov 2022 02:59:56 +0000 (+1000)
Subject: If the entity cannot be unstuck when dropping it to the floor, mark it as on ground... 
X-Git-Tag: xonotic-v0.8.6~275^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31f72590298ad6368f5ecee81b3348de7300e855;p=xonotic%2Fxonotic-data.pk3dir.git

If the entity cannot be unstuck when dropping it to the floor, mark it as on ground to avoid physics attempting to drop it, work around #2774
---

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index fd3b5b08d..c61147842 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -2298,6 +2298,12 @@ void DropToFloor_Handler(entity this)
 			// if support is destroyed, keep suspended (gross hack for floating items in various maps)
 			this.move_suspendedinair = true;
 		}
+		else
+		{
+			// if we can't get the entity out of solid, mark it as on ground so physics doesn't attempt to drop it
+			// hacky workaround for #2774
+			SET_ONGROUND(this);
+		}
 	}
 	this.dropped_origin = this.origin;
 }