From 2498cff1888a541d86ab21adaf90ffc1e51d44a5 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sun, 24 Nov 2019 15:38:46 +1300 Subject: [PATCH] Only un note items if its not player owned --- .../src/redone/game/shops/ShopAssistant.java | 30 ++++++++++++++---- .../redone/game/shops/ShopAssistant.class | Bin 12533 -> 12825 bytes 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java index 7be26ce5..6a7165b4 100644 --- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java @@ -1,13 +1,11 @@ package redone.game.shops; import redone.Constants; -import redone.game.bots.Bot; import redone.game.bots.BotHandler; import redone.game.items.Item; import redone.game.items.ItemAssistant; import redone.game.items.ItemDefinitions; import redone.game.players.Client; -import redone.game.players.Player; import redone.game.players.PlayerHandler; import redone.util.GameLogger; @@ -412,10 +410,10 @@ public class ShopAssistant { } player.getItemAssistant().deleteItem(itemID, amount); - String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID - 1).toLowerCase(); - if (itemName.contains(ItemNameUnNotedItem)) { - itemID = itemID - 1; //Replace the noted item by it's un-noted version. - } + + // Only un note items if it's not a player owned store + if (!ShopHandler.playerOwnsStore(player.myShopId, player)) + itemID = getUnNoted(itemID); if (ShopHandler.playerOwnsStore(player.myShopId, player)) { // Add items to players store @@ -464,7 +462,25 @@ public class ShopAssistant { } return true; } - + + private static int getUnNoted(int itemID){ + String itemName = ItemAssistant.getItemName(itemID).toLowerCase(); + String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID - 1).toLowerCase(); + if (itemName.contains(ItemNameUnNotedItem)) { + itemID--; //Replace the noted item by it's un-noted version. + } + return itemID; + } + + private static int getNoted(int itemID){ + String itemName = ItemAssistant.getItemName(itemID).toLowerCase(); + String ItemNameUnNotedItem = ItemAssistant.getItemName(itemID + 1).toLowerCase(); + if (itemName.contains(ItemNameUnNotedItem)) { + itemID++; //Replace the item by it's noted version. + } + return itemID; + } + private static final int FISHING_ITEMS[] = {383, 371, 377, 359, 321, 341, 353, 345, 327, 317}; public boolean buyItem(int itemID, int fromSlot, int amount) { diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class index 5f933c670341431359bfa01865735952bd989a31..c430d13187fd81e168f07c2d1ed81643c35b80b7 100644 GIT binary patch delta 4945 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 delta 4704 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