Compare commits

...
1 Commits
Author SHA1 Message Date
mts2200 eaea2df8ee Improve NPE checks (#26)
(cherry picked from commit 1879ba2071)
2025-02-23 17:33:11 +01:00
@@ -79,17 +79,25 @@ public class WorldExtensionManager {
@SubscribeEvent @SubscribeEvent
public void onChunkWatch(Watch event) { public void onChunkWatch(Watch event) {
Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos); WorldExtension[] extensions = worldMap.get(event.player.worldObj);
for (WorldExtension extension : worldMap.get(event.player.worldObj))
extension.watchChunk(chunk, event.player); if (extensions != null) {
Chunk chunk = event.player.worldObj
.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
for (WorldExtension extension : extensions) extension.watchChunk(chunk, event.player);
}
} }
@SubscribeEvent @SubscribeEvent
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void onChunkUnWatch(UnWatch event) { public void onChunkUnWatch(UnWatch event) {
Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos); WorldExtension[] extensions = worldMap.get(event.player.worldObj);
for (WorldExtension extension : worldMap.get(event.player.worldObj))
extension.unwatchChunk(chunk, event.player); if (extensions != null) {
Chunk chunk = event.player.worldObj
.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
for (WorldExtension extension : extensions) extension.unwatchChunk(chunk, event.player);
}
} }
@SubscribeEvent @SubscribeEvent
@@ -110,7 +118,7 @@ public class WorldExtensionManager {
} }
private static boolean initialised; private static boolean initialised;
private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<WorldExtensionInstantiator>(); private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<>();
public static void registerWorldExtension(WorldExtensionInstantiator init) { public static void registerWorldExtension(WorldExtensionInstantiator init) {
if (!initialised) init(); if (!initialised) init();
@@ -125,7 +133,7 @@ public class WorldExtensionManager {
FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler()); FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler());
} }
private static HashMap<World, WorldExtension[]> worldMap = new HashMap<World, WorldExtension[]>(); private static HashMap<World, WorldExtension[]> worldMap = new HashMap<>();
private static void onWorldLoad(World world) { private static void onWorldLoad(World world) {
WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()]; WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()];