diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f592c4d5..782dda75 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,12 +8,33 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - math.sq - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/2006Redone Server/src/redone/game/bots/Bot.java b/2006Redone Server/src/redone/game/bots/Bot.java index 086c4cac..1816e0e4 100644 --- a/2006Redone Server/src/redone/game/bots/Bot.java +++ b/2006Redone Server/src/redone/game/bots/Bot.java @@ -1,6 +1,5 @@ package redone.game.bots; - import redone.Server; import redone.game.players.Client; import redone.game.players.Player; diff --git a/2006Redone Server/src/redone/game/bots/BotConstants.java b/2006Redone Server/src/redone/game/bots/BotConstants.java index fc64cdff..1ac4b665 100644 --- a/2006Redone Server/src/redone/game/bots/BotConstants.java +++ b/2006Redone Server/src/redone/game/bots/BotConstants.java @@ -1,6 +1,5 @@ package redone.game.bots; -public class BotConstants -{ +public class BotConstants { public static final int MAX_BOTS = 100; } \ No newline at end of file diff --git a/2006Redone Server/src/redone/game/bots/BotHandler.java b/2006Redone Server/src/redone/game/bots/BotHandler.java index ab6b3173..311f11e0 100644 --- a/2006Redone Server/src/redone/game/bots/BotHandler.java +++ b/2006Redone Server/src/redone/game/bots/BotHandler.java @@ -2,10 +2,8 @@ package redone.game.bots; import redone.Constants; import redone.game.players.Client; -import redone.game.players.Player; import redone.game.players.PlayerHandler; import redone.game.shops.ShopHandler; -import redone.util.Misc; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java index 1fea7de1..ff219400 100644 --- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java @@ -26,7 +26,7 @@ public class ShopAssistant { public static final int RANGE_SHOP = 111, PEST_SHOP = 175, CASTLE_SHOP = 112; public boolean shopSellsItem(int itemID) { - for (int i = 0; i < ShopHandler.ShopItems.length; i++) { + for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) { if (itemID == ShopHandler.ShopItems[player.myShopId][i] - 1) { return true; } @@ -82,7 +82,7 @@ public class ShopAssistant { player.getOutStream().writeWord(3900); player.getOutStream().writeWord(player.TotalShopItems); int TotalCount = 0; - for (int i = 0; i < ShopHandler.ShopItems.length; i++) + for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) { if (ShopHandler.ShopItems[ShopID][i] > 0 || i <= ShopHandler.ShopItemsStandard[ShopID]) @@ -449,14 +449,14 @@ public class ShopAssistant { if (Item.itemIsNote[itemID]) { itemID = player.getItemAssistant().getUnnotedItem(itemID); } - for (int i = 0; i < ShopHandler.ShopItems.length; i++) { + for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) { if (ShopHandler.ShopItems[player.myShopId][i] - 1 == itemID) { ShopHandler.ShopItemsN[player.myShopId][i] += amount; Added = true; } } if (Added == false) { - for (int i = 0; i < ShopHandler.ShopItems.length; i++) { + for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) { if (ShopHandler.ShopItems[player.myShopId][i] == 0) { ShopHandler.ShopItems[player.myShopId][i] = itemID + 1; ShopHandler.ShopItemsN[player.myShopId][i] = amount; diff --git a/2006Redone Server/src/redone/game/shops/ShopHandler.java b/2006Redone Server/src/redone/game/shops/ShopHandler.java index 797caaef..efe76307 100644 --- a/2006Redone Server/src/redone/game/shops/ShopHandler.java +++ b/2006Redone Server/src/redone/game/shops/ShopHandler.java @@ -179,8 +179,6 @@ public class ShopHandler { player.myShopId = id; ShopSModifier[id] = 0; ShopName[id] = player.properName + "'s Store"; - ShopItems[id][0] = 2; - ShopItemsN[id][0] = 1; TotalShops++; } diff --git a/CompiledServer/production/2006rebotted/redone/Constants.class b/CompiledServer/production/2006rebotted/redone/Constants.class index e662b84c..31ad2602 100644 Binary files a/CompiledServer/production/2006rebotted/redone/Constants.class and b/CompiledServer/production/2006rebotted/redone/Constants.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/Bot$TradeChat.class b/CompiledServer/production/2006rebotted/redone/game/bots/Bot$TradeChat.class new file mode 100644 index 00000000..9284b8ea Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/game/bots/Bot$TradeChat.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class b/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class new file mode 100644 index 00000000..7d9461b0 Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/BotConstants.class b/CompiledServer/production/2006rebotted/redone/game/bots/BotConstants.class new file mode 100644 index 00000000..8a56f846 Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/game/bots/BotConstants.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class new file mode 100644 index 00000000..cb0dfd14 Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class b/CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class index 9c6e4964..4fee9904 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class b/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class index 8215f6ec..5f102003 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class and b/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class index 38f53639..fc02061c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class index 7481ff23..47973e79 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class index 38347078..68eff099 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client.class b/CompiledServer/production/2006rebotted/redone/game/players/Client.class index 0905a0ee..a83e9661 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Player.class b/CompiledServer/production/2006rebotted/redone/game/players/Player.class index 1b25b8f5..be020df7 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Player.class and b/CompiledServer/production/2006rebotted/redone/game/players/Player.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class index efaf8cd0..f80b943a 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class index 9b311e7b..abc70394 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class index 0dc367bb..ed85363b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class index 6e3c5d7c..c4d24113 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class index b48b250d..48471374 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class b/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class index 3f077688..3e3ef90d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Trading.class b/CompiledServer/production/2006rebotted/redone/game/players/Trading.class index 7e554797..2c81539e 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Trading.class and b/CompiledServer/production/2006rebotted/redone/game/players/Trading.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class index 9431c173..8f7d618b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class index 94e79045..ab029a39 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class and b/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/ActionSender.class b/CompiledServer/production/2006rebotted/redone/net/ActionSender.class index 640c5433..8aa15059 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/ActionSender.class and b/CompiledServer/production/2006rebotted/redone/net/ActionSender.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class b/CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class index d16c8c7b..7bdece02 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class and b/CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class index 3949d210..32aa5c08 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class index 0cd68629..187e52b0 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class index 1589e72e..7c8641c9 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class differ