From c081eb24ff54b01886af99e933c9d3a71f0ffaf1 Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sun, 21 Apr 2024 18:47:40 +0200
Subject: [PATCH] Ore gen v2 (#16)

* Fix typo in island gui

* Add glow for challenges that are completed.

* Enhance ore generators to generate the ore when the block is broken.

* Fix worlds not unloading.

* Fix generating ore for obsidian.
---
 .../listeners/CobbestoneGeneratorListener.java            | 8 +++++---
 .../worldgenerator/MasterWorldGenerator.java              | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugin/src/main/java/com/alttd/cometskyblock/listeners/CobbestoneGeneratorListener.java b/plugin/src/main/java/com/alttd/cometskyblock/listeners/CobbestoneGeneratorListener.java
index f8d663b..f619917 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/listeners/CobbestoneGeneratorListener.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/listeners/CobbestoneGeneratorListener.java
@@ -26,7 +26,7 @@ public class CobbestoneGeneratorListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onBockForm(BlockFormEvent blockFormEvent) {
-        Block block = blockFormEvent.getNewState().getBlock();
+        Block block = blockFormEvent.getBlock();
         if (block.getType() == Material.OBSIDIAN)
             return;
 
@@ -43,9 +43,11 @@ public class CobbestoneGeneratorListener implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
         Block block = event.getBlock();
-        if(!block.hasMetadata(GENERATOR_METADATA_KEY)) {
+        if(!block.hasMetadata(GENERATOR_METADATA_KEY))
+            return;
+
+        if (block.getType() == Material.OBSIDIAN)
             return;
-        }
 
         Island island = Island.getIsland(block.getWorld().getUID());
         Material generatedMaterial = plugin.generatorHandler().generateOre(island, block.getType());
diff --git a/plugin/src/main/java/com/alttd/cometskyblock/worldgenerator/MasterWorldGenerator.java b/plugin/src/main/java/com/alttd/cometskyblock/worldgenerator/MasterWorldGenerator.java
index 038d137..7ed810e 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/worldgenerator/MasterWorldGenerator.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/worldgenerator/MasterWorldGenerator.java
@@ -86,6 +86,7 @@ public class MasterWorldGenerator {
                     return;
                 }
                 newIsland.setDifficulty(Difficulty.NORMAL);
+                newIsland.setKeepSpawnInMemory(false);
                 newIsland.setGameRule(GameRule.DO_INSOMNIA, false);
                 // TODO Load a schematic into this world?
                 // Currently random islands are generated by CometIslandGenerator()
@@ -119,6 +120,7 @@ public class MasterWorldGenerator {
             return null;
         }
 
+        newIsland.setKeepSpawnInMemory(false);
         newIsland.setDifficulty(Difficulty.NORMAL); // TODO - island options to set difficulty
         return newIsland;
     }