Ignore ZNPCsPlus hologram serialization errors

Closes LMBishop#618
Krakenied · Feb 29, 2024 · 1503f5b · 1503f5b
1 parent 888d55b
commit 1503f5b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/...va/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java b/...va/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusDeliverTaskType.java
@@ -33,10 +33,21 @@ public void onNpcInteract(NpcInteractEvent event) {
         if (lineCount > 0) {
             StringBuilder nameBuilder = new StringBuilder();
             for (int i = 0; i < lineCount; i++) {
-                String line = hologram.getLine(i);
+                boolean lastLine = (i == lineCount - 1);
+
+                String line;
+                try {
+                    line = hologram.getLine(i);
+                } catch (Throwable ignored) {
+                    if (lastLine) {
+                        nameBuilder.deleteCharAt(nameBuilder.length() - 1);
+                    }
+                    continue;
+                }
+
                 nameBuilder.append(line);
 
-                if (i != lineCount - 1) {
+                if (!lastLine) {
                     nameBuilder.append('\n');
                 }
             }

diff --git a/...a/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java b/...a/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ZNPCsPlusInteractTaskType.java
@@ -33,10 +33,21 @@ public void onNpcInteract(NpcInteractEvent event) {
         if (lineCount > 0) {
             StringBuilder nameBuilder = new StringBuilder();
             for (int i = 0; i < lineCount; i++) {
-                String line = hologram.getLine(i);
+                boolean lastLine = (i == lineCount - 1);
+
+                String line;
+                try {
+                    line = hologram.getLine(i);
+                } catch (Throwable ignored) {
+                    if (lastLine) {
+                        nameBuilder.deleteCharAt(nameBuilder.length() - 1);
+                    }
+                    continue;
+                }
+
                 nameBuilder.append(line);
 
-                if (i != lineCount - 1) {
+                if (!lastLine) {
                     nameBuilder.append('\n');
                 }
             }