diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-04-30 00:12:48 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-04-30 00:12:48 -0400 |
| commit | 57b9d6d553943190c58b7d5f77d2ee475fe36479 (patch) | |
| tree | 7ce172587805403606d31792be8c81c80e55256c /gamemode/server | |
| parent | c90d4ae74d9a51249009ebac34d3627bc3812fa3 (diff) | |
| download | gmstranded-57b9d6d553943190c58b7d5f77d2ee475fe36479.tar.gz gmstranded-57b9d6d553943190c58b7d5f77d2ee475fe36479.tar.bz2 gmstranded-57b9d6d553943190c58b7d5f77d2ee475fe36479.zip | |
Improvements to inventory
Diffstat (limited to 'gamemode/server')
| -rw-r--r-- | gamemode/server/player_functions.lua | 19 |
1 files changed, 5 insertions, 14 deletions
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 |