From 3a4895590efa46b5ffc827d80f3513bf205d4320 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sat, 23 Nov 2019 14:01:42 +1300 Subject: [PATCH] fixup close shop, re-open shop --- .../src/redone/game/bots/BotHandler.java | 26 ++++++++++++------ .../redone/game/bots/BotHandler.class | Bin 6086 -> 7060 bytes 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/2006Redone Server/src/redone/game/bots/BotHandler.java b/2006Redone Server/src/redone/game/bots/BotHandler.java index 8b465d71..c56d47ce 100644 --- a/2006Redone Server/src/redone/game/bots/BotHandler.java +++ b/2006Redone Server/src/redone/game/bots/BotHandler.java @@ -1,5 +1,6 @@ package redone.game.bots; +import io.netty.util.Timeout; import redone.Constants; import redone.game.players.Client; import redone.game.players.PlayerHandler; @@ -105,15 +106,24 @@ public class BotHandler public static void closeShop(Client player) { Client shop = getPlayerShop(player); if (shop == null) return; - shop.disconnected = true; - shop.logout(true); - for (int index = 0; index < botList.size(); index++){ - if (botList.get(index).getBotClient().properName.equalsIgnoreCase(player.properName)) { - botList.remove(index); - return; + shop.getPlayerAssistant().movePlayer(0,0,0); + new Thread(() -> { + try { + Thread.sleep(500); + shop.disconnected = true; + shop.logout(true); + for (int index = 0; index < botList.size(); index++){ + if (botList.get(index).getBotClient().properName.equalsIgnoreCase(player.properName)) { + botList.remove(index); + return; + } + index++; + } } - index++; - } + catch (Exception e){ + System.err.println(e); + } + }).start(); } public static void addCoins(int shop_id, int amount){ diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class index f20611e84f61c5350156108e3ab2723346f50d2f..98a295b2e83e28bd6c2e2f6f914edcb94b96e03c 100644 GIT binary patch delta 3608 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