diff options
Diffstat (limited to 'bukkit/src/main/java/com')
2 files changed, 26 insertions, 4 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 2a1e6e96..6c0ed18f 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 @@ -33,10 +33,21 @@ public final class ZNPCsPlusDeliverTaskType extends DeliverTaskType<String> { 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/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 ec6816f6..7afb5d4a 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 @@ -33,10 +33,21 @@ public final class ZNPCsPlusInteractTaskType extends InteractTaskType<String> { 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'); } } |