From fc671ec6b64e9906378913dabc658e30415a8cc6 Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Fri, 27 Dec 2013 16:30:21 +0100
Subject: [PATCH] Reset bounding box when player dies. This should get rid of
 #11.

---
 lua/weapons/disguiser/init.lua | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lua/weapons/disguiser/init.lua b/lua/weapons/disguiser/init.lua
index 2560ce3..3080787 100644
--- a/lua/weapons/disguiser/init.lua
+++ b/lua/weapons/disguiser/init.lua
@@ -353,7 +353,9 @@ hook.Add("PlayerDeath", "Disguiser.ThirdPersonDeath", function(victim, inflictor
 		dentity:SetPos(victim:GetPos())
 		dentity:SetVelocity(victim:GetVelocity())
 		local physics = victim:GetPhysicsObject()
-		dentity:SetBloodColor(BLOOD_COLOR_RED) -- this thing was alive, ya know? :(
+		if !!victim:GetBloodColor() then
+			dentity:SetBloodColor(victim:GetBloodColor()) -- this thing was alive, ya know? :(
+		end
 		dentity:Spawn()
 		local dphysics = dentity:GetPhysicsObject()
 		dphysics:SetAngles(physics:GetAngles())
@@ -365,7 +367,6 @@ hook.Add("PlayerDeath", "Disguiser.ThirdPersonDeath", function(victim, inflictor
 		dentity:Fire("enablemotion","",0)
 		
 		// Let the entity bleed wahahaha. I'm mad, ain't I?
-		victim:SetBloodColor(BLOOD_COLOR_RED) -- this thing was alive, ya know? :(
 		local traceworld = {}
 		traceworld.start = victim:GetPos() + Vector(0, 0, 20)
 		traceworld.endpos = traceworld.start + (Vector(0,0,-1) * 8000) // aim max. 8000 units down
@@ -377,6 +378,12 @@ hook.Add("PlayerDeath", "Disguiser.ThirdPersonDeath", function(victim, inflictor
 		edata:SetNormal(trw.Normal)
 		edata:SetEntity(dentity)
 		util.Effect("BloodImpact", edata)
+		
+		// Reset the victim's bounding box to solve the issue with getting stuck at spawn
+		victim:ResetHull()
+		umsg.Start("resetHull", owner)
+		umsg.Entity(owner)
+		umsg.End()
 	end
 end)