From 57b9d6d553943190c58b7d5f77d2ee475fe36479 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Sat, 30 Apr 2016 00:12:48 -0400
Subject: Improvements to inventory

---
 gamemode/server/player_functions.lua | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'gamemode/server')

diff --git a/gamemode/server/player_functions.lua b/gamemode/server/player_functions.lua
index 646f851..b8afc32 100644
--- a/gamemode/server/player_functions.lua
+++ b/gamemode/server/player_functions.lua
@@ -656,18 +656,9 @@ end
 
 function PlayerMeta:CancelProcess()
 	if ( !self.InProcess ) then return end
-
-	local v = self.ProcessTable
-	if ( !v.Cancel ) then return end
-
-	if ( v.Owner and v.Owner != NULL and IsValid( v.Owner ) ) then
-		v.Owner:Freeze( false )
-		v.Owner:StopProcessBar()
-		v.Owner.InProcess = false
-		v.Owner:SendMessage( "Cancelled.", 3, Color( 200, 0, 0, 255 ) )
-	end
-
-	v.IsStopped = true
-	timer.Destroy( "GMS_ProcessTimer_" .. v.TimerID )
-	GAMEMODE:RemoveProcessThink( v )
+	timer.Destroy("process")
+	self:Freeze(false)
+	self.InProcess = false
+	self:SendMessage( "Cancelled.", 3, Color( 200, 0, 0, 255 ) )
+	self:StopProcessBar()
 end
-- 
cgit v1.2.3-70-g09d2