diff --git a/build.gradle b/build.gradle index 8850655b..2e2aa73c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.3.4" +version = "1.3.5-dev" group = "cr0s.warpdrive" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "warpdrive" diff --git a/src/main/java/cr0s/warpdrive/SpaceEventHandler.java b/src/main/java/cr0s/warpdrive/SpaceEventHandler.java index f1b7f820..ee404d5d 100644 --- a/src/main/java/cr0s/warpdrive/SpaceEventHandler.java +++ b/src/main/java/cr0s/warpdrive/SpaceEventHandler.java @@ -83,9 +83,9 @@ public class SpaceEventHandler { || entity.worldObj.provider.dimensionId == WarpDriveConfig.G_HYPERSPACE_DIMENSION_ID) { Block block1 = entity.worldObj.getBlock(x, y, z); Block block2 = entity.worldObj.getBlock(x, y + 1, z); - boolean inVacuum = (!block1.isAssociatedBlock(WarpDrive.blockAir) && !block2.isAssociatedBlock(WarpDrive.blockAir)); + boolean notInVacuum = block1.isAssociatedBlock(WarpDrive.blockAir) || block2.isAssociatedBlock(WarpDrive.blockAir); Integer air; - if (!inVacuum) {// In space with air blocks + if (notInVacuum) {// In space with air blocks air = entity_airBlock.get(entity.getEntityId()); if (air == null) { entity_airBlock.put(entity.getEntityId(), AIR_BLOCK_TICKS); diff --git a/src/main/java/cr0s/warpdrive/block/weapon/BlockLaserCamera.java b/src/main/java/cr0s/warpdrive/block/weapon/BlockLaserCamera.java index 37db69b9..1db8db6a 100644 --- a/src/main/java/cr0s/warpdrive/block/weapon/BlockLaserCamera.java +++ b/src/main/java/cr0s/warpdrive/block/weapon/BlockLaserCamera.java @@ -14,7 +14,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cr0s.warpdrive.WarpDrive; import cr0s.warpdrive.block.TileEntityLaser; -import cr0s.warpdrive.conf.WarpDriveConfig; import cr0s.warpdrive.data.CameraRegistryItem; import cr0s.warpdrive.render.ClientCameraHandler; @@ -80,9 +79,6 @@ public class BlockLaserCamera extends BlockContainer { int cameraFrequency = ((TileEntityLaser)tileEntity).getCameraFrequency(); CameraRegistryItem cam = WarpDrive.instance.cameras.getCameraByFrequency(par1World, cameraFrequency); - if (WarpDriveConfig.LOGGING_CAMERA) { - WarpDrive.logger.info("Camera detected as " + cam); - } WarpDrive.addChatMessage(entityPlayer, getLocalizedName() + ": Beam frequency '" + beamFrequency + "' is " + ((beamFrequency < 0) ? "invalid!" : "valid.") + " Camera frequency '" + cameraFrequency + "' is " + ((cam == null) ? "invalid!" : "valid for laser-camera at " + cam.position.chunkPosX + ", " + cam.position.chunkPosY + ", " + cam.position.chunkPosZ));