From 604537b325abc1eeb926e438c0bc4965b9c482b3 Mon Sep 17 00:00:00 2001 From: Krakenied Date: Thu, 15 Feb 2024 15:16:04 +0100 Subject: Use current hologram data for ServerNPC task types --- bukkit/libs/ServerNPC-1.16.1-b1.jar | Bin 4635 -> 9133 bytes .../type/dependent/ServerNPCDeliverTaskType.java | 16 +++++++++++----- .../type/dependent/ServerNPCInteractTaskType.java | 16 +++++++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) (limited to 'bukkit') diff --git a/bukkit/libs/ServerNPC-1.16.1-b1.jar b/bukkit/libs/ServerNPC-1.16.1-b1.jar index a7a1d8eb..c1879fe8 100644 Binary files a/bukkit/libs/ServerNPC-1.16.1-b1.jar and b/bukkit/libs/ServerNPC-1.16.1-b1.jar differ diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCDeliverTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCDeliverTaskType.java index 5c768b85..3a0dae5f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCDeliverTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCDeliverTaskType.java @@ -28,11 +28,17 @@ public final class ServerNPCDeliverTaskType extends DeliverTaskType { } SnakeNPC npc = event.getSnakeNPC(); - SnakeHologram hologram = npc.getHologram(); - List hologramLines = hologram.getLines(); - String name = !hologramLines.isEmpty() - ? String.join("\n", hologramLines) - : null; + SnakeHologram hologram = npc.getSettings().getHologram(); + String name; + + if (hologram != null) { + List 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/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCInteractTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCInteractTaskType.java index 451efe04..5996a41c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCInteractTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ServerNPCInteractTaskType.java @@ -28,11 +28,17 @@ public final class ServerNPCInteractTaskType extends InteractTaskType { } SnakeNPC npc = event.getSnakeNPC(); - SnakeHologram hologram = npc.getHologram(); - List hologramLines = hologram.getLines(); - String name = !hologramLines.isEmpty() - ? String.join("\n", hologramLines) - : null; + SnakeHologram hologram = npc.getSettings().getHologram(); + String name; + + if (hologram != null) { + List hologramLines = hologram.getLines(); + name = !hologramLines.isEmpty() + ? String.join("\n", hologramLines) + : null; + } else { + name = null; + } handle(event.getPlayer(), npc.getName(), name, plugin); } -- cgit v1.2.3-70-g09d2