From 0ab65791ba5bfd3cfd10e65592d842dd2c613a3f Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 8 Sep 2019 01:10:03 +1000 Subject: [PATCH] Do a trace when throwing the flag to ensure it isn't placed inside a solid ceiling --- qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc index 939c70e29..03b2ec9d1 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc @@ -440,7 +440,8 @@ void ctf_Handle_Throw(entity player, entity receiver, int droptype) // reset the flag setattachment(flag, NULL, ""); - setorigin(flag, player.origin + FLAG_DROP_OFFSET); + tracebox(player.origin - FLAG_DROP_OFFSET, flag.m_mins, flag.m_maxs, player.origin + FLAG_DROP_OFFSET, MOVE_NOMONSTERS, flag); + setorigin(flag, trace_endpos); flag.owner.flagcarried = NULL; GameRules_scoring_vip(flag.owner, false); flag.owner = NULL; -- 2.39.2