From 8f248f3d3072db95d7bbe97a5c87b4a6b4190b41 Mon Sep 17 00:00:00 2001 From: William Moodhe / JetBoom Date: Thu, 22 Oct 2015 03:56:21 -0400 Subject: [PATCH] Update obj_entity_extend.lua --- gamemodes/zombiesurvival/gamemode/obj_entity_extend.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gamemodes/zombiesurvival/gamemode/obj_entity_extend.lua b/gamemodes/zombiesurvival/gamemode/obj_entity_extend.lua index d8d88a2..905c8be 100644 --- a/gamemodes/zombiesurvival/gamemode/obj_entity_extend.lua +++ b/gamemodes/zombiesurvival/gamemode/obj_entity_extend.lua @@ -33,8 +33,13 @@ function meta:ClipHullTraceHull(distance, size, start, dir) return self:TraceHull(distance, mask, size, filter, start) end -function meta:ClipHullMeleeTrace(distance, size, start) - return self:ClipHullTraceHull(distance, size, start) +function meta:ClipHullMeleeTrace(distance, size, filter, start) + local cliphullpretrace = self:ClipHullTraceHull(distance, size, start) + if cliphullpretrace and LASTHITCLIPHULL then + return cliphullpretrace + end + + return self:MeleeTrace(distance, size, filter, start) end -- Extremely shitty workaround for util trace functions not using clip hulls