From 821501afd4878220e0b2a4a5a09f3df3c4b5410a Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 14 Jan 2023 23:33:15 +0100 Subject: [PATCH] Fix #2798 "Armor shards stuck in ground on equinox_lightfix" --- qcsrc/server/world.qc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index 47198b7d9..18d41827b 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -2267,7 +2267,10 @@ void DropToFloor_Handler(entity this) // NOTE: SV_NudgeOutOfSolid is used in the engine here if(autocvar_sv_gameplayfix_droptofloorstartsolid_nudgetocorrect) + { + _Movetype_UnstickEntity(this); move_out_of_solid(this); + } tracebox(this.origin, this.mins, this.maxs, end, MOVE_NORMAL, this); @@ -2291,7 +2294,10 @@ void DropToFloor_Handler(entity this) LOG_DEBUGF("DropToFloor_Handler: %v fixed badly placed entity", this.origin); setorigin(this, trace_endpos); if(autocvar_sv_gameplayfix_droptofloorstartsolid_nudgetocorrect) + { + _Movetype_UnstickEntity(this); move_out_of_solid(this); + } SET_ONGROUND(this); this.groundentity = trace_ent; // if support is destroyed, keep suspended (gross hack for floating items in various maps) -- 2.39.2