From 4e4cab3ecc837b1127b326a8b4f8179c27dc63e0 Mon Sep 17 00:00:00 2001 From: ThisTestUser Date: Sun, 25 Sep 2022 17:59:46 -0400 Subject: [PATCH] Fix bots not being removed properly --- .../src/main/java/net/nuggetmc/tplus/bot/Bot.java | 2 +- .../src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java index 2dcc356..cdf8d5e 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java @@ -609,7 +609,7 @@ public class Bot extends ServerPlayer implements Terminator { // this should fix the concurrentmodificationexception mentioned above, I used the ConcurrentHashMap.newKeySet to make a "ConcurrentHashSet" plugin.getManager().remove(this); - scheduler.runTaskLater(plugin, this::setDead, 30); + scheduler.runTaskLater(plugin, this::removeBot, 30); this.removeTab(); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java index 51925f9..a0f93a8 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java @@ -164,7 +164,7 @@ public class BotManagerImpl implements BotManager, Listener { @Override public void reset() { if (!bots.isEmpty()) { - bots.forEach(Terminator::removeVisually); + bots.forEach(Terminator::removeBot); bots.clear(); // Not always necessary, but a good security measure }