From da0e877d03e0ab427d6132d98baae7d068191c3d Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 24 Jun 2023 10:58:56 +0200 Subject: [PATCH] Fixes compatibility with DecentHolograms --- .../java/com/songoda/epicanchors/AnchorManagerImpl.java | 9 +++++---- EpicAnchors-Plugin/src/main/resources/plugin.yml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/AnchorManagerImpl.java b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/AnchorManagerImpl.java index 6b80c38..219387b 100644 --- a/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/AnchorManagerImpl.java +++ b/EpicAnchors-Plugin/src/main/java/com/songoda/epicanchors/AnchorManagerImpl.java @@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit; public class AnchorManagerImpl implements AnchorManager { private static final String ERR_WORLD_NOT_READY = "EpicAnchors has not finished initializing that world yet"; + private static final String HOLOGRAM_PREFIX = "Anchor_"; private final SongodaPlugin plugin; private final DataManager dataManager; @@ -395,12 +396,12 @@ public class AnchorManagerImpl implements AnchorManager { for (Anchor anchor : anchors) { List lines = Collections.singletonList(formatAnchorText(anchor.getTicksLeft(), true)); - if (!HologramManager.isHologramLoaded("Anchor#" + anchor.getDbId())) { - HologramManager.createHologram("Anchor#" + anchor.getDbId(), anchor.getLocation(), lines); + if (!HologramManager.isHologramLoaded(HOLOGRAM_PREFIX + anchor.getDbId())) { + HologramManager.createHologram(HOLOGRAM_PREFIX + anchor.getDbId(), anchor.getLocation(), lines); continue; } - hologramData.put("Anchor#" + anchor.getDbId(), lines); + hologramData.put(HOLOGRAM_PREFIX + anchor.getDbId(), lines); } // Create the holograms @@ -472,6 +473,6 @@ public class AnchorManagerImpl implements AnchorManager { } private static void removeHologram(Anchor anchor) { - HologramManager.removeHologram("Anchor#" + anchor.getDbId()); + HologramManager.removeHologram(HOLOGRAM_PREFIX + anchor.getDbId()); } } diff --git a/EpicAnchors-Plugin/src/main/resources/plugin.yml b/EpicAnchors-Plugin/src/main/resources/plugin.yml index 787fbe0..9fdd47f 100644 --- a/EpicAnchors-Plugin/src/main/resources/plugin.yml +++ b/EpicAnchors-Plugin/src/main/resources/plugin.yml @@ -8,6 +8,7 @@ softdepend: - Holograms - HolographicDisplays - Vault + - DecentHolograms author: Craftaro authors: [ SpraxDev ]