Checks player by reference in future logic

anjoismysign · Aug 13, 2024 · 7ed800f · 7ed800f
1 parent 5aec95c
commit 7ed800f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/us/mytheria/bloblib/displayentity/ArmorStandFloatingPet.java b/src/main/java/us/mytheria/bloblib/displayentity/ArmorStandFloatingPet.java
@@ -107,7 +107,7 @@ private void initAnimations(JavaPlugin plugin) {
     private void initLogic(JavaPlugin plugin) {
         logicTask = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
             Player owner = findOwner();
-            if (owner == null || !owner.isOnline()) {
+            if (owner == null) {
                 destroy();
                 return;
             }

diff --git a/src/main/java/us/mytheria/bloblib/displayentity/DisplayFloatingPet.java b/src/main/java/us/mytheria/bloblib/displayentity/DisplayFloatingPet.java
@@ -115,7 +115,7 @@ protected void initLogic(JavaPlugin plugin) {
         EntityAnimationsCarrier animationsCarrier = settings.animationsCarrier();
         logicTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
             Player owner = findOwner();
-            if (owner == null || !owner.isOnline()) {
+            if (owner == null) {
                 destroy();
                 return;
             }

diff --git a/src/main/java/us/mytheria/bloblib/displayentity/DisplayPackFloatingPet.java b/src/main/java/us/mytheria/bloblib/displayentity/DisplayPackFloatingPet.java
@@ -51,7 +51,7 @@ protected void initLogic(JavaPlugin plugin) {
         EntityAnimationsCarrier animationsCarrier = settings.animationsCarrier();
         logicTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
             Player owner = findOwner();
-            if (owner == null || !owner.isOnline()) {
+            if (owner == null) {
                 destroy();
                 return;
             }

diff --git a/src/main/java/us/mytheria/bloblib/entities/listeners/BlobChatListener.java b/src/main/java/us/mytheria/bloblib/entities/listeners/BlobChatListener.java
@@ -62,14 +62,14 @@ public static BlobChatListener smart(Player owner, long timeout, Consumer<String
         messages.forEach(message -> timerMessages.add(
                 message.modify(s -> s.replace("%world%", owner.getWorld().getName()))
         ));
+        UUID uuid = owner.getUniqueId();
         return new BlobChatListener(owner.getName(), timeout,
                 inputListener -> {
                     String input = inputListener.getInput();
                     chatManager.removeChatListener(owner);
                     Bukkit.getScheduler().runTask(main, () -> {
-                        if (owner == null || !owner.isOnline()) {
+                        if (owner != Bukkit.getPlayer(uuid))
                             return;
-                        }
                         consumer.accept(input);
                     });
                 },

diff --git a/src/main/java/us/mytheria/bloblib/entities/listeners/BlobDropListener.java b/src/main/java/us/mytheria/bloblib/entities/listeners/BlobDropListener.java
@@ -53,13 +53,13 @@ public static BlobDropListener smart(Player owner, Consumer<ItemStack> consumer,
         DropListenerManager dropManager = main.getDropListenerManager();
         Optional<BlobMessage> timerMessage = Optional.ofNullable(BlobLibMessageAPI.getInstance().getMessage(timerMessageKey, owner));
         List<BlobMessage> messages = timerMessage.map(Collections::singletonList).orElse(Collections.emptyList());
+        UUID uuid = owner.getUniqueId();
         return new BlobDropListener(owner.getName(), listener -> {
             ItemStack input = listener.getInput();
             dropManager.removeDropListener(owner);
             Bukkit.getScheduler().runTask(main, () -> {
-                if (owner == null || !owner.isOnline()) {
+                if (owner != Bukkit.getPlayer(uuid))
                     return;
-                }
                 consumer.accept(input);
             });
         }, messages);