From f62133d5c2d8d65e7bf88208640edec88153e1c8 Mon Sep 17 00:00:00 2001
From: Krakenied <Krakenied1@gmail.com>
Date: Thu, 29 Feb 2024 20:51:46 +0100
Subject: Ensure that the entire holo hasn't been skipped

---
 .../bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java    | 6 +++++-
 .../bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'bukkit/src/main/java')

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;
         }
-- 
cgit v1.2.3-70-g09d2