From 3e4cc8841d676bfe8125056638a2fbec702dd428 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <65736624+CocoTheOwner@users.noreply.github.com>
Date: Mon, 14 Dec 2020 09:30:49 +0100
Subject: [PATCH] Patch closing comp nullpoint
---
Iris.iml | 23 ++++++++++++++++++-
.../engine/EngineCompositeGenerator.java | 12 ++++++----
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/Iris.iml b/Iris.iml
index 74f3f131c..f54c3d5a6 100644
--- a/Iris.iml
+++ b/Iris.iml
@@ -1,2 +1,23 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
index 249efab0a..cf7bfedb1 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
@@ -614,12 +614,14 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
@Override
public void close() {
J.car(art);
- getComposite().close();
+ if (getComposite() != null) {
+ getComposite().close();
- if(isStudio())
- {
- IrisWorlds.evacuate(getComposite().getWorld());
- Bukkit.unloadWorld(getComposite().getWorld(), !isStudio());
+
+ if (isStudio()) {
+ IrisWorlds.evacuate(getComposite().getWorld());
+ Bukkit.unloadWorld(getComposite().getWorld(), !isStudio());
+ }
}
}