diff --git a/build-number.txt b/build-number.txt index 60be2614..3f7edff6 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -3207 \ No newline at end of file +3211 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java index 998e0532..b99e91c3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java @@ -221,10 +221,8 @@ public class CorePlugin implements Listener { } } - // thanks chipmunk for this new tellraw method - public CompletableFuture runTracked (final String command) { return runTracked(false, command); } - - public CompletableFuture runTracked (final boolean useCargo, final String command) { + // thanks chipmunk for this "new" tellraw method which is pretty much used by everyone now + public CompletableFuture runTracked (final String command) { if (!ready || command.length() > 32767) return null; if (!bot.options.useCore) return null; @@ -240,7 +238,7 @@ public class CorePlugin implements Listener { final CompletableFuture trackedFuture = new CompletableFuture<>(); - final CompletableFuture future = bot.query.block(useCargo, coreBlock, "LastOutput", true); + final CompletableFuture future = bot.query.block(false, coreBlock, "LastOutput", true); future.thenApply(output -> { if (output == null) return null; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java index 9f9b5b48..45dc2b44 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -111,7 +111,7 @@ public class PlayersPlugin implements Listener { return; } - final CompletableFuture trackedCoreFuture = bot.core.runTracked(true, "essentials:seen " + target.profile.getIdAsString()); + final CompletableFuture trackedCoreFuture = bot.core.runTracked("essentials:seen " + target.profile.getIdAsString()); if (trackedCoreFuture == null) { outputFuture.complete(null); @@ -291,11 +291,11 @@ public class PlayersPlugin implements Listener { bot.listener.dispatch(listener -> listener.onPlayerDisplayNameUpdated(target, displayName)); } - private CompletableFuture getLastKnownName (final String uuid) { - return bot.query.entity(true, uuid, "bukkit.lastKnownName"); + private CompletableFuture getLastKnownName (final boolean useCargo, final String uuid) { + return bot.query.entity(useCargo, uuid, "bukkit.lastKnownName"); } - private void check (final PlayerEntry target) { + private void check (final boolean useCargo, final PlayerEntry target) { final PlayerEntry pending = pendingLeftPlayers.stream() .filter(player -> player.equals(target)) .findAny() @@ -303,7 +303,7 @@ public class PlayersPlugin implements Listener { if (pending != null) pendingLeftPlayers.remove(pending); - final CompletableFuture future = getLastKnownName(target.profile.getIdAsString()); + final CompletableFuture future = getLastKnownName(useCargo, target.profile.getIdAsString()); future.thenApply(lastKnownName -> { // checking for empty string means @@ -364,7 +364,7 @@ public class PlayersPlugin implements Listener { return; for (final PlayerEntry target : new ArrayList<>(list)) { - check(target); + check(true, target); } } @@ -381,7 +381,7 @@ public class PlayersPlugin implements Listener { } } else { pendingLeftPlayers.add(target); - check(target); + check(false, target); } }