From 41a7d05becaf4d4f6149319fc8dd925aa05e78be Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 31 May 2022 08:59:09 -0500
Subject: [PATCH] More local vars for optimization

---
 scripts/server/item.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/server/item.js b/scripts/server/item.js
index 9c1ed3a2..df086f9e 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -733,7 +733,7 @@ function playerUseItem(client, hotBarSlot) {
 	let itemTypeData = getItemTypeData(itemIndex);
 	let hotBarItems = getPlayerData(client).hotBarItems;
 
-	switch(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useType) {
+	switch(itemTypeData.useType) {
 		case VRR_ITEM_USETYPE_SKIN: {
 			getPlayerData(client).itemActionItem = itemIndex;
 			forcePlayerIntoSkinSelect(client);
@@ -744,10 +744,12 @@ function playerUseItem(client, hotBarSlot) {
 			for(let i in hotBarItems) {
 				if(hotBarItems[i] != -1) {
 					if(getItemData(hotBarItems[i]) != false) {
-						if(itemTypeData.useType == VRR_ITEM_USETYPE_AMMO_CLIP) {
-							if(itemTypeData.useId == itemTypeData.databaseId) {
-								givePlayerWeaponAmmo(client, getItemData(hotBarItems[i]).value);
-								getItemData(hotBarItems[hotBarSlot]).value = getItemData(hotBarItems[hotBarSlot]).value + getItemData(hotBarItems[i]).value;
+						if(getItemData(getItemData(hotBarItems[i]).itemTypeIndex).useType == VRR_ITEM_USETYPE_AMMO_CLIP) {
+							let ammoItemData = getItemData(hotBarItems[i]);
+							let ammoItemTypeData = getItemData(ammoItemData.itemTypeIndex);
+							if(ammoItemTypeData.useId == itemTypeData.databaseId) {
+								givePlayerWeaponAmmo(client, ammoItemData.value);
+								itemData.value = itemData.value + ammoItemData.value;
 								deleteItem(hotBarItems[i]);
 								meActionToNearbyPlayers(client, `loads some ammo into their ${itemTypeData.name}`);
 								return true;
@@ -929,7 +931,7 @@ function playerUseItem(client, hotBarSlot) {
 					}
 
 					itemData.value = itemData.value - itemTypeData.useValue;
-					//if(getItemData(itemIndex).value <= 0) {
+					//if(itemData.value <= 0) {
 					//	destroyItem(itemIndex);
 					//}
 				}