From 93b51eb8538ccdd8473035d58953aa8cdaf58af7 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Fri, 20 May 2016 14:50:39 +0200
Subject: [PATCH] Removed value that was turned to true when having generated
 the spawn cave as it would've been overriden on world join anyway. As there's
 only one spawn, unless you set it into chunks that haven't generated yet, it
 doesn't matter anyways.

---
 .../actuallyadditions/mod/config/ConfigValues.java  |  2 +-
 .../mod/gen/cave/ChunkProviderCave.java             | 13 ++++++-------
 .../actuallyadditions/mod/misc/WorldData.java       | 12 ------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java
index e36ed5191..d6f7e123b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java
@@ -41,7 +41,7 @@ public class ConfigValues{
     public static boolean lessParticles;
     public static boolean lessBlockBreakingEffects;
 
-    public static boolean caveWorld = false; //TODO Make this proper
+    public static boolean caveWorld = true; //TODO Make this proper
 
     public static void defineConfigValues(Configuration config){
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java
index f9f197639..6ca5aa47c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/cave/ChunkProviderCave.java
@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.gen.cave;
 
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
@@ -27,7 +28,6 @@ import java.util.Random;
 
 public class ChunkProviderCave implements IChunkGenerator{
 
-    private boolean generatedSpawn;
     private final World world;
     private final Random rand;
 
@@ -74,12 +74,11 @@ public class ChunkProviderCave implements IChunkGenerator{
 
     @Override
     public void populate(int x, int z){
-        if(!this.generatedSpawn){
-            BlockPos spawn = this.world.getSpawnPoint();
-            Chunk chunk = this.world.getChunkFromBlockCoords(spawn);
-            if(chunk.xPosition == x && chunk.zPosition == z){
-                this.generatedSpawn = this.spawnGenerator.generate(this.world, this.rand, spawn);
-            }
+        BlockPos spawn = this.world.getSpawnPoint();
+        Chunk chunk = this.world.getChunkFromBlockCoords(spawn);
+        if(chunk.xPosition == x && chunk.zPosition == z){
+            this.spawnGenerator.generate(this.world, this.rand, spawn);
+            ModUtil.LOGGER.info("Generating spawn cave...");
         }
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
index 9d7dc204a..1382873b0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
@@ -25,8 +25,6 @@ public class WorldData extends WorldSavedData{
     public static final String DATA_TAG = ModUtil.MOD_ID+"WorldData";
     private static WorldData instance;
 
-    public static NBTTagCompound additionalData = new NBTTagCompound();
-
     public WorldData(String tag){
         super(tag);
     }
@@ -71,10 +69,6 @@ public class WorldData extends WorldSavedData{
             ModUtil.LOGGER.info("Clearing leftover Persistent Server Data from other worlds!");
             PersistentServerData.playerSaveData.clear();
         }
-        if(!additionalData.hasNoTags()){
-            ModUtil.LOGGER.info("Clearing leftover Additional Data from other worlds!");
-            additionalData = new NBTTagCompound();
-        }
     }
 
     @Override
@@ -92,9 +86,6 @@ public class WorldData extends WorldSavedData{
             PersistentServerData.PlayerSave aSave = PersistentServerData.PlayerSave.fromNBT(playerList.getCompoundTagAt(i));
             PersistentServerData.playerSaveData.add(aSave);
         }
-
-        //Additional Data
-        additionalData = compound.getCompoundTag("Additional");
     }
 
     @Nonnull
@@ -115,9 +106,6 @@ public class WorldData extends WorldSavedData{
         }
         compound.setTag("PlayerData", playerList);
 
-        //Additional Data
-        compound.setTag("Additional", additionalData);
-
         return compound;
     }
 }