From 7700d72a99d10d3659daf2bd53c29f2554a84262 Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Sun, 26 Jan 2014 12:01:04 -0400 Subject: [PATCH] Cleaned Up FastRiftRegenerator Cleaned up the code in FastRiftRegenerator - mostly spacing, but also removed a pointless null check. It wouldn't matter because the reference was being accessed before it was checked and it should be impossible for it to be null. --- .../ticking/FastRiftRegenerator.java | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/ticking/FastRiftRegenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/FastRiftRegenerator.java index c0d2804..95af20c 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/ticking/FastRiftRegenerator.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/FastRiftRegenerator.java @@ -6,18 +6,14 @@ import java.util.List; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import StevenDimDoors.mod_pocketDim.core.DimLink; -import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; -import StevenDimDoors.mod_pocketDim.util.ChunkLocation; import StevenDimDoors.mod_pocketDim.util.Point4D; public class FastRiftRegenerator implements IRegularTickReceiver { - private static final int RIFT_REGENERATION_INTERVAL = 10; //Regenerate random rifts every 200 ticks - private ArrayList locationsToRegen=new ArrayList(); + private static final int RIFT_REGENERATION_INTERVAL = 10; //Regenerate random rifts every 10 ticks + private ArrayList locationsToRegen = new ArrayList(); public FastRiftRegenerator(IRegularTickSender sender) { @@ -32,33 +28,30 @@ public class FastRiftRegenerator implements IRegularTickReceiver { public void regenerateRiftsInAllWorlds() { - if(this.locationsToRegen.isEmpty()) + if (this.locationsToRegen.isEmpty()) { return; } - List loadedWorlds = (List)Arrays.asList(DimensionManager.getIDs()); + List loadedWorlds = (List) Arrays.asList(DimensionManager.getIDs()); - for(Point4D point: this.locationsToRegen) + for (Point4D point: this.locationsToRegen) { - if(loadedWorlds.contains(point.getDimension())&&PocketManager.getLink(point)!=null) + if (loadedWorlds.contains(point.getDimension()) && PocketManager.getLink(point) != null) { World world = DimensionManager.getWorld(point.getDimension()); - - if(point!=null) - { - if (!mod_pocketDim.blockRift.isBlockImmune(world, point.getX(), point.getY(), point.getZ())&& world.getChunkProvider().chunkExists(point.getX() >> 4, point.getZ() >> 4)) - { - world.setBlock(point.getX(), point.getY(), point.getZ(), mod_pocketDim.blockRift.blockID); - } - } + if (!mod_pocketDim.blockRift.isBlockImmune(world, point.getX(), point.getY(), point.getZ()) + && world.getChunkProvider().chunkExists(point.getX() >> 4, point.getZ() >> 4)) + { + world.setBlock(point.getX(), point.getY(), point.getZ(), mod_pocketDim.blockRift.blockID); + } } } this.locationsToRegen.clear(); } + public void registerRiftForRegen(int x, int y, int z, int dimID) { - this.locationsToRegen.add(new Point4D(x,y,z,dimID)); + this.locationsToRegen.add(new Point4D(x, y, z, dimID)); } - }