diff options
| author | Krakenied <Krakenied1@gmail.com> | 2024-02-29 20:51:46 +0100 |
|---|---|---|
| committer | Leonardo Bishop <13875753+LMBishop@users.noreply.github.com> | 2024-03-09 16:15:02 +0000 |
| commit | f62133d5c2d8d65e7bf88208640edec88153e1c8 (patch) | |
| tree | 0f14341e3950fe7ee0186999431922cc44fa09e1 /bukkit/src | |
| parent | 68c27395702bbcc08dee5a81a08b638bfcbef76c (diff) | |
Ensure that the entire holo hasn't been skipped
Diffstat (limited to 'bukkit/src')
2 files changed, 10 insertions, 2 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java index 6c0ed18f..71ec2fe6 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java @@ -31,6 +31,8 @@ public final class ZNPCsPlusDeliverTaskType extends DeliverTaskType<String> { int lineCount = hologram.lineCount(); if (lineCount > 0) { + boolean empty = true; + StringBuilder nameBuilder = new StringBuilder(); for (int i = 0; i < lineCount; i++) { boolean lastLine = (i == lineCount - 1); @@ -46,12 +48,14 @@ public final class ZNPCsPlusDeliverTaskType extends DeliverTaskType<String> { } nameBuilder.append(line); + if (empty) empty = false; if (!lastLine) { nameBuilder.append('\n'); } } - name = nameBuilder.toString(); + + name = !empty ? nameBuilder.toString() : null; } else { name = null; } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java index 7afb5d4a..64543f78 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java @@ -31,6 +31,8 @@ public final class ZNPCsPlusInteractTaskType extends InteractTaskType<String> { int lineCount = hologram.lineCount(); if (lineCount > 0) { + boolean empty = true; + StringBuilder nameBuilder = new StringBuilder(); for (int i = 0; i < lineCount; i++) { boolean lastLine = (i == lineCount - 1); @@ -46,12 +48,14 @@ public final class ZNPCsPlusInteractTaskType extends InteractTaskType<String> { } nameBuilder.append(line); + if (empty) empty = false; if (!lastLine) { nameBuilder.append('\n'); } } - name = nameBuilder.toString(); + + name = !empty ? nameBuilder.toString() : null; } else { name = null; } |