From 31f72590298ad6368f5ecee81b3348de7300e855 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 28 Nov 2022 12:59:56 +1000 Subject: [PATCH] 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 --- qcsrc/server/world.qc | 6 ++++++ 1 file changed, 6 insertions(+) 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; } -- 2.39.2