Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix docking station crash in negative-numbered dimensions

Browse source
This commit is contained in:
asiekierka 2014-10-24 16:57:33 +02:00
parent 4ac490a581
commit 7f0f16ef62
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/buildcraft/core/robots/RobotRegistry.java
View file

@ -29,7 +29,7 @@ import buildcraft.api.robots.ResourceId;
public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
public static RobotRegistry[] registries = new RobotRegistry[256];
public static HashMap<Integer, RobotRegistry> registries = new HashMap<Integer, RobotRegistry>();
protected World world;
@ -270,8 +270,8 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
}
public static synchronized RobotRegistry getRegistry(World world) {
if (registries[world.provider.dimensionId] == null
|| registries[world.provider.dimensionId].world != world) {
if (!registries.containsKey(world.provider.dimensionId)
|| registries.get(world.provider.dimensionId).world != world) {
RobotRegistry newRegistry = (RobotRegistry) world.perWorldStorage.loadData(RobotRegistry.class, "robotRegistry");
@ -286,10 +286,12 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
((DockingStation) d).world = world;
}
registries[world.provider.dimensionId] = newRegistry;
registries.put(world.provider.dimensionId, newRegistry);
return newRegistry;
}
return registries[world.provider.dimensionId];
return registries.get(world.provider.dimensionId);
}
@Override