From a447ea18a358628d57c4f35ee3c872c1532956cf Mon Sep 17 00:00:00 2001
From: danorris709 <dnorris443@gmail.com>
Date: Sun, 8 Aug 2021 20:21:17 +0100
Subject: [PATCH] Fix: start-up crashes delete holograms

---
 .../holograms/forge/hologram/ForgeHologram.java  | 16 +++++++++++++---
 .../forge/hologram/HologramManager.java          |  2 ++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/forge/src/main/java/com/envyful/holograms/forge/hologram/ForgeHologram.java b/forge/src/main/java/com/envyful/holograms/forge/hologram/ForgeHologram.java
index 5c9c2b1..111132d 100644
--- a/forge/src/main/java/com/envyful/holograms/forge/hologram/ForgeHologram.java
+++ b/forge/src/main/java/com/envyful/holograms/forge/hologram/ForgeHologram.java
@@ -39,7 +39,7 @@ public ForgeHologram(String id, World world, Vec3d position, boolean save, Strin
         this.world = world;
         this.position = position;
 
-        this.addLines(lines);
+        this.addLines(save, lines);
         HologramManager.addHologram(this);
 
         if (save) {
@@ -49,18 +49,26 @@ public ForgeHologram(String id, World world, Vec3d position, boolean save, Strin
 
     @Override
     public void addLines(String... lines) {
+        this.addLines(true, lines);
+    }
+
+    private void addLines(boolean save, String... lines) {
         if (!FMLCommonHandler.instance().getMinecraftServerInstance().isCallingFromMinecraftThread()) {
             UtilForgeConcurrency.runSync(() -> this.addLines(lines));
             return;
         }
 
         for (String line : lines) {
-            this.addLine(line);
+            this.addLine(line, save);
         }
     }
 
     @Override
     public void addLine(String line) {
+        this.addLine(line, true);
+    }
+
+    private void addLine(String line, boolean save) {
         if (!FMLCommonHandler.instance().getMinecraftServerInstance().isCallingFromMinecraftThread()) {
             UtilForgeConcurrency.runSync(() -> this.addLine(line));
             return;
@@ -73,7 +81,9 @@ public void addLine(String line) {
         armorStand.setText(line);
         this.spawnLine(armorStand);
 
-        HologramManager.save();
+        if (save) {
+            HologramManager.save();
+        }
     }
 
     @Override
diff --git a/forge/src/main/java/com/envyful/holograms/forge/hologram/HologramManager.java b/forge/src/main/java/com/envyful/holograms/forge/hologram/HologramManager.java
index 7983ec6..0be84f3 100644
--- a/forge/src/main/java/com/envyful/holograms/forge/hologram/HologramManager.java
+++ b/forge/src/main/java/com/envyful/holograms/forge/hologram/HologramManager.java
@@ -45,7 +45,9 @@ public static void preInit() {
     private static HologramSaver saver;
 
     public static void load() {
+        System.out.println("LOADING HOLOGRAMS");
         saver.load();
+        System.out.println("LOADED HOLOGRAMS");
     }
 
     public static void save() {