diff options
| author | Krakenied <Krakenied1@gmail.com> | 2024-02-15 15:16:04 +0100 |
|---|---|---|
| committer | Leonardo Bishop <13875753+LMBishop@users.noreply.github.com> | 2024-02-18 12:19:16 +0000 |
| commit | 604537b325abc1eeb926e438c0bc4965b9c482b3 (patch) | |
| tree | 775d8dc857c4c932c2c2516ea6d81f25d32ee958 /bukkit | |
| parent | 0229544f53472a1fa67131694dd6746e8f1c94ea (diff) | |
Use current hologram data for ServerNPC task types
Diffstat (limited to 'bukkit')
3 files changed, 22 insertions, 10 deletions
diff --git a/bukkit/libs/ServerNPC-1.16.1-b1.jar b/bukkit/libs/ServerNPC-1.16.1-b1.jar Binary files differindex a7a1d8eb..c1879fe8 100644 --- a/bukkit/libs/ServerNPC-1.16.1-b1.jar +++ b/bukkit/libs/ServerNPC-1.16.1-b1.jar 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<String> { } 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/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<String> { } 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); } |