Fix #1387 Crash when creating a new world

This commit is contained in:
Nedelosk committed 2016-08-14 00:42:20 +02:00
1 parent b056cce707
commit f5a9dcccb8
2 files changed
+17 -23

No files matched your search

@@ -22,20 +22,6 @@ public class 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());
@@ -13,6 +13,8 @@ package forestry.core.climate;
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 class ClimateManager implements IClimateManager{
@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 class ClimateManager implements IClimateManager{
@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;