More work on compile errors, New system for ToolClasses, using a ToolType class instead to de-stringify things.

This commit is contained in:
LexManos committed 2018-09-21 01:47:12 -07:00
1 parent 0cd21ebe7e
commit cdfa7caaeb
33 files changed
+1668 -519

No files matched your search

@@ -219,13 +219,11 @@ public class DimensionManager
{
worlds.put(id, world);
weakWorldMap.put(world, world);
server.worldTickTimes.put(id, new long[100]);
LOGGER.info(DIMMGR,"Loading dimension {} ({}) ({})", id, world.getWorldInfo().getWorldName(), world.getMinecraftServer());
}
else
{
worlds.remove(id);
server.worldTickTimes.remove(id);
LOGGER.info(DIMMGR,"Unloading dimension {}", id);
}
@@ -287,12 +285,23 @@ public class DimensionManager
}
public static WorldServer getWorld(int id, boolean resetUnloadDelay)
{
return getWorld(id, resetUnloadDelay, false);
}
public static WorldServer getWorld(int id, boolean resetUnloadDelay, boolean forceLoad)
{
if (resetUnloadDelay && unloadQueue.contains(id))
{
dimensions.get(id).ticksWaited = 0;
}
return worlds.get(id);
WorldServer ret = worlds.get(id);
if (ret != null && forceLoad)
{
initDimension(id);
ret = worlds.get(id);
}
return ret;
}
public static WorldServer[] getWorlds()
@@ -379,7 +388,7 @@ public class DimensionManager
/*
* To be called by the server at the appropriate time, do not call from mod code.
*/
public static void unloadWorlds(Hashtable<Integer, long[]> worldTickTimes)
public static void unloadWorlds()
{
IntIterator queueIterator = unloadQueue.iterator();
while (queueIterator.hasNext())