From 611ccd9605b9fe300215d5950dce2dfc390d067d Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Fri, 13 Aug 2021 21:28:23 +1200 Subject: [PATCH 1/3] Only hotload noise gen if a generator is open --- src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java index d0969827d..fa612adcb 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java @@ -108,7 +108,8 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List @EventHandler public void on(IrisEngineHotloadEvent e) { - generator = loader.get(); + if (generator != null) + generator = loader.get(); } public void mouseWheelMoved(MouseWheelEvent e) { From 7153347d6764d65b32c6a0aec15b19a4e6d349b6 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Fri, 13 Aug 2021 05:56:52 -0400 Subject: [PATCH 2/3] Auto stash before merge of "master" and "origin/master" --- src/main/java/com/volmit/iris/util/decree/EXAMPLE.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java index bd65c3919..9ad62545c 100644 --- a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java +++ b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java @@ -18,6 +18,10 @@ package com.volmit.iris.util.decree; +<<<<<<< Updated upstream +======= +import com.volmit.iris.engine.object.biome.IrisBiome; +>>>>>>> Stashed changes import org.bukkit.entity.Player; public class EXAMPLE From 9a58e121e827a73f8f8e60302e647e106634d522 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Fri, 13 Aug 2021 05:58:44 -0400 Subject: [PATCH 3/3] Fix example --- src/main/java/com/volmit/iris/util/decree/EXAMPLE.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java index 9ad62545c..bd65c3919 100644 --- a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java +++ b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java @@ -18,10 +18,6 @@ package com.volmit.iris.util.decree; -<<<<<<< Updated upstream -======= -import com.volmit.iris.engine.object.biome.IrisBiome; ->>>>>>> Stashed changes import org.bukkit.entity.Player; public class EXAMPLE