Fix #1387 Crash when creating a new world

ForestryMC · Aug 13, 2016 · f5a9dcc · f5a9dcc
1 parent b056cce
commit f5a9dcc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/src/main/java/forestry/core/climate/ClimateEventHandler.java b/src/main/java/forestry/core/climate/ClimateEventHandler.java
@@ -22,20 +22,6 @@ public ClimateEventHandler() {
 		serverTicks = new HashMap<>();
 	}
 
-	@SubscribeEvent
-	public void onLoadWorld(WorldEvent.Load event){
-		IClimateManager manager = ForestryAPI.climateManager;
-		Integer dimonsionID = Integer.valueOf(event.getWorld().provider.getDimension());
-		Map<Integer, List<IClimateRegion>> regions = manager.getRegions();
-		Map<Integer, Map<BlockPos, IClimateSource>> sources = manager.getSources();
-		if(regions.get(dimonsionID) == null){
-			regions.put(dimonsionID, new ArrayList<>());
-		}
-		if(sources.get(dimonsionID) == null){
-			sources.put(dimonsionID, new HashMap<>());
-		}
-	}
-
 	@SubscribeEvent
 	public void onWorldTick(TickEvent.WorldTickEvent event) {
 		Integer dim = Integer.valueOf(event.world.provider.getDimension());

diff --git a/src/main/java/forestry/core/climate/ClimateManager.java b/src/main/java/forestry/core/climate/ClimateManager.java
@@ -13,6 +13,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,21 +73,23 @@ public void removeRegion(IClimateRegion region) {
 
 	@Override
 	public void removeSource(IClimateSource source) {
-		if(sources.get(Integer.valueOf(source.getWorld().provider.getDimension())) == null){
-			sources.put(Integer.valueOf(source.getWorld().provider.getDimension()), new HashMap<>());
+		Integer dimensionID = Integer.valueOf(source.getWorld().provider.getDimension());
+		if(!sources.containsKey(dimensionID)){
+			sources.put(dimensionID, new HashMap<>());
 		}
-		if(sources.get(Integer.valueOf(source.getWorld().provider.getDimension())).keySet().contains(source.getPos())){
-			sources.get(Integer.valueOf(source.getWorld().provider.getDimension())).remove(source.getPos(), source);
+		if(sources.get(dimensionID).keySet().contains(source.getPos())){
+			sources.get(dimensionID).remove(source.getPos(), source);
 		}
 	}
 
 	@Override
 	public void addSource(IClimateSource source) {
-		if(sources.get(Integer.valueOf(source.getWorld().provider.getDimension())) == null){
-			sources.put(Integer.valueOf(source.getWorld().provider.getDimension()), new HashMap<>());
+		Integer dimensionID = Integer.valueOf(source.getWorld().provider.getDimension());
+		if(!sources.containsKey(dimensionID)){
+			sources.put(dimensionID, new HashMap<>());
 		}
-		if(sources.get(Integer.valueOf(source.getWorld().provider.getDimension())).get(source.getPos()) == null){
-			sources.get(Integer.valueOf(source.getWorld().provider.getDimension())).put(source.getPos(), source);
+		if(sources.get(dimensionID).get(source.getPos()) == null){
+			sources.get(dimensionID).put(source.getPos(), source);
 		}
 	}
 
@@ -124,7 +128,11 @@ public Map<Integer, List<IClimateRegion>> getRegions() {
 
 	@Override
 	public IClimateRegion getRegionForPos(World world, BlockPos pos){
-		List<IClimateRegion> regions = this.regions.get(Integer.valueOf(world.provider.getDimension()));
+		Integer dimensionID = Integer.valueOf(world.provider.getDimension());
+		if(!regions.containsKey(dimensionID)){
+			this.regions.put(dimensionID, new ArrayList<>());
+		}
+		List<IClimateRegion> regions = this.regions.get(dimensionID);
 		for(IClimateRegion region : regions){
 			if(region.getPositions().keySet().contains(pos)){
 				return region;