Fix not disappearing holograms

EpicPlayerA10 · May 29, 2024 · feb3a7e · feb3a7e
1 parent 45601c8
commit feb3a7e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/HologramOwner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/HologramOwner.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Nonnull;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.util.Vector;
@@ -25,15 +26,28 @@ public interface HologramOwner extends ItemAttribute {
     /**
      * This will update the hologram text for the given {@link Block}.
      * 
-     * @param b
+     * @param hologramOwnerBlock
      *            The {@link Block} to which the hologram belongs
      * 
      * @param text
      *            The nametag for the hologram
      */
-    default void updateHologram(@Nonnull Block b, @Nonnull String text) {
-        Location loc = b.getLocation().add(getHologramOffset(b));
-        Slimefun.getHologramsService().setHologramLabel(loc, ChatColors.color(text));
+    default void updateHologram(@Nonnull Block hologramOwnerBlock, @Nonnull String text) {
+        Runnable runnable = () -> {
+            // Fix not disappearing holograms (#3176)
+            if (Slimefun.getTickerTask().isDeletedSoon(hologramOwnerBlock.getLocation())) {
+                return;
+            }
+
+            Location loc = hologramOwnerBlock.getLocation().add(getHologramOffset(hologramOwnerBlock));
+            Slimefun.getHologramsService().setHologramLabel(loc, ChatColors.color(text));
+        };
+
+        if (Bukkit.isPrimaryThread()) {
+            runnable.run();
+        } else {
+            Slimefun.runSync(runnable);
+        }
     }
 
     /**

diff --git a/...ain/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/HologramsService.java b/...ain/java/io/github/thebusybiscuit/slimefun4/core/services/holograms/HologramsService.java
@@ -252,23 +252,19 @@ private void updateHologram(@Nonnull Location loc, @Nonnull Consumer<Hologram> c
         Validate.notNull(loc, "Location must not be null");
         Validate.notNull(consumer, "Callbacks must not be null");
 
-        Runnable runnable = () -> {
-            try {
-                Hologram hologram = getHologram(loc, true);
+        if (!Bukkit.isPrimaryThread()) {
+            throw new UnsupportedOperationException("You cannot update a hologram asynchronously");
+        }
 
-                if (hologram != null) {
-                    consumer.accept(hologram);
-                }
-            } catch (Exception | LinkageError x) {
-                Slimefun.logger().log(Level.SEVERE, "Hologram located at {0}", new BlockPosition(loc));
-                Slimefun.logger().log(Level.SEVERE, "Something went wrong while trying to update this hologram", x);
-            }
-        };
+        try {
+            Hologram hologram = getHologram(loc, true);
 
-        if (Bukkit.isPrimaryThread()) {
-            runnable.run();
-        } else {
-            Slimefun.runSync(runnable);
+            if (hologram != null) {
+                consumer.accept(hologram);
+            }
+        } catch (Exception | LinkageError x) {
+            Slimefun.logger().log(Level.SEVERE, "Hologram located at {0}", new BlockPosition(loc));
+            Slimefun.logger().log(Level.SEVERE, "Something went wrong while trying to update this hologram", x);
         }
     }