From b1d58d2abd6bf5db013f0a4059522309014b2503 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 1 Jan 2019 11:03:02 +0100 Subject: [PATCH] Removed some never used streaming helpers --- client/modules/streaming.lua | 28 ---------------------------- server/classes/player.lua | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/client/modules/streaming.lua b/client/modules/streaming.lua index 0c278f82..143d0c0c 100644 --- a/client/modules/streaming.lua +++ b/client/modules/streaming.lua @@ -28,20 +28,6 @@ function ESX.Streaming.RequestStreamedTextureDict(textureDict, cb) end end -function ESX.Streaming.RequestPtfxAsset(assetName, cb) - if not HasPtfxAssetLoaded(assetName) then - RequestPtfxAsset(assetName) - - while not HasPtfxAssetLoaded(assetName) do - Citizen.Wait(1) - end - end - - if cb ~= nil then - cb() - end -end - function ESX.Streaming.RequestNamedPtfxAsset(assetName, cb) if not HasNamedPtfxAssetLoaded(assetName) then RequestNamedPtfxAsset(assetName) @@ -97,17 +83,3 @@ function ESX.Streaming.RequestWeaponAsset(weaponHash, cb) cb() end end - -function ESX.Streaming.RequestClipSet(clipSet, cb) - if not HasClipSetLoaded(clipSet) then - RequestClipSet(clipSet) - - while not HasClipSetLoaded(clipSet) do - Citizen.Wait(1) - end - end - - if cb ~= nil then - cb() - end -end \ No newline at end of file diff --git a/server/classes/player.lua b/server/classes/player.lua index 1ced96d6..15f2b57a 100644 --- a/server/classes/player.lua +++ b/server/classes/player.lua @@ -429,7 +429,7 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l self.removeWeaponComponent = function(weaponName, weaponComponent) local loadoutNum, weapon = self.getWeapon(weaponName) - + if not weapon then return end