Use current hologram data for ServerNPC task types

LMBishop · Feb 18, 2024 · 604537b · 604537b
1 parent 0229544
commit 604537b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/bukkit/libs/ServerNPC-1.16.1-b1.jar b/bukkit/libs/ServerNPC-1.16.1-b1.jar
diff --git a/...va/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCDeliverTaskType.java b/...va/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCDeliverTaskType.java
@@ -28,11 +28,17 @@ public void onNPCInteract(NPCInteractEvent event) {
         }
 
         SnakeNPC npc = event.getSnakeNPC();
-        SnakeHologram hologram = npc.getHologram();
-        List<String> hologramLines = hologram.getLines();
-        String name = !hologramLines.isEmpty()
-                ? String.join("\n", hologramLines)
-                : null;
+        SnakeHologram hologram = npc.getSettings().getHologram();
+        String name;
+
+        if (hologram != null) {
+            List<String> hologramLines = hologram.getLines();
+            name = !hologramLines.isEmpty()
+                    ? String.join("\n", hologramLines)
+                    : null;
+        } else {
+            name = null;
+        }
 
         checkInventory(event.getPlayer(), npc.getName(), name, 1L, plugin);
     }

diff --git a/...a/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCInteractTaskType.java b/...a/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCInteractTaskType.java
@@ -28,11 +28,17 @@ public void onNPCInteract(NPCInteractEvent event) {
         }
 
         SnakeNPC npc = event.getSnakeNPC();
-        SnakeHologram hologram = npc.getHologram();
-        List<String> hologramLines = hologram.getLines();
-        String name = !hologramLines.isEmpty()
-                ? String.join("\n", hologramLines)
-                : null;
+        SnakeHologram hologram = npc.getSettings().getHologram();
+        String name;
+
+        if (hologram != null) {
+            List<String> hologramLines = hologram.getLines();
+            name = !hologramLines.isEmpty()
+                    ? String.join("\n", hologramLines)
+                    : null;
+        } else {
+            name = null;
+        }
 
         handle(event.getPlayer(), npc.getName(), name, plugin);
     }