use both weapon.HoldType and weapon:GetHoldType() (#529)

* use both weapon.HoldType and weapon:GetHoldType()
CloudSixteen · Sep 8, 2019 · 13bf9e7 · 13bf9e7
1 parent 25f3555
commit 13bf9e7
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/upload/garrysmod/gamemodes/clockwork/framework/libraries/sh_animation.lua b/upload/garrysmod/gamemodes/clockwork/framework/libraries/sh_animation.lua
@@ -852,17 +852,14 @@ end;
 --]]
 function Clockwork.animation:GetWeaponHoldType(player, weapon)
 	local class = string.lower(weapon:GetClass());
-	local weaponTable = weapons.GetStored(class);
 	local holdType = "fist";
 
 	if (self.holdTypes[class]) then
 		holdType = self.holdTypes[class];
-	elseif (weaponTable and weaponTable.HoldType) then
-		if (self.convert[weaponTable.HoldType]) then
-			holdType = self.convert[weaponTable.HoldType];
-		else
-			holdType = weaponTable.HoldType;
-		end;
+	elseif (IsValid(weapon)) then
+		local _holdType = weapon.HoldType or weapon:GetHoldType();
+
+		holdType = self.convert[_holdType] or _holdType;
 	else
 		local act = player:Weapon_TranslateActivity(ACT_HL2MP_IDLE) or -1;
 
@@ -1083,4 +1080,4 @@ Clockwork.animation:AddCombineOverwatchModel("models/combine_soldier_prisonguard
 Clockwork.animation:AddCombineOverwatchModel("models/combine_super_soldier.mdl");
 Clockwork.animation:AddCombineOverwatchModel("models/combine_soldier.mdl");
 
-Clockwork.animation:AddCivilProtectionModel("models/police.mdl");
+Clockwork.animation:AddCivilProtectionModel("models/police.mdl");