From 7ee32520704d71ff2e776d491f3db9f67ba2d198 Mon Sep 17 00:00:00 2001 From: LemADEC Date: Mon, 7 Sep 2015 23:54:14 +0200 Subject: [PATCH] Code cleanup --- .../java/cr0s/warpdrive/block/TileEntityChunkLoader.java | 1 - src/main/java/cr0s/warpdrive/command/CommandSpace.java | 2 +- src/main/java/cr0s/warpdrive/data/JumpBlock.java | 2 +- src/main/java/cr0s/warpdrive/data/Vector3.java | 7 ++----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java b/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java index d1b767cb9..96fc7d8f6 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java @@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.chunk.Chunk; -import cr0s.warpdrive.WarpDrive; import cr0s.warpdrive.api.IUpgradable; import cr0s.warpdrive.config.WarpDriveConfig; import cr0s.warpdrive.data.EnumUpgradeTypes; diff --git a/src/main/java/cr0s/warpdrive/command/CommandSpace.java b/src/main/java/cr0s/warpdrive/command/CommandSpace.java index e94163020..43c6adf0e 100644 --- a/src/main/java/cr0s/warpdrive/command/CommandSpace.java +++ b/src/main/java/cr0s/warpdrive/command/CommandSpace.java @@ -33,7 +33,7 @@ public void processCommand(ICommandSender sender, String[] args) { int targetDimensionId = Integer.MAX_VALUE; EntityPlayerMP player = null; - if (sender != null && sender instanceof EntityPlayerMP) { + if (sender instanceof EntityPlayerMP) { player = (EntityPlayerMP) sender; } diff --git a/src/main/java/cr0s/warpdrive/data/JumpBlock.java b/src/main/java/cr0s/warpdrive/data/JumpBlock.java index e1e1e1d57..885fe463d 100644 --- a/src/main/java/cr0s/warpdrive/data/JumpBlock.java +++ b/src/main/java/cr0s/warpdrive/data/JumpBlock.java @@ -131,7 +131,7 @@ public boolean deploy(World targetWorld, int offsetX, int offsetY, int offsetZ) } } else { WarpDrive.logger.info(" deploy failed to create new tile entity at " + x + ", " + y + ", " + z + " blockId " + block + ":" + blockMeta); - WarpDrive.logger.info("NBT data was " + ((oldnbt == null) ? "null" : oldnbt.toString())); + WarpDrive.logger.info("NBT data was " + oldnbt); } } } catch (Exception exception) { diff --git a/src/main/java/cr0s/warpdrive/data/Vector3.java b/src/main/java/cr0s/warpdrive/data/Vector3.java index d0c6716d1..bf75c0ea7 100644 --- a/src/main/java/cr0s/warpdrive/data/Vector3.java +++ b/src/main/java/cr0s/warpdrive/data/Vector3.java @@ -676,11 +676,8 @@ public MovingObjectPosition rayTraceEntities(World world, float rotationYaw, flo if (aabb.isVecInside(startingPosition)) { if (0.0D < closestEntity || closestEntity == 0.0D) { pickedEntity = new MovingObjectPosition(entityHit); - - if (pickedEntity != null) { - pickedEntity.hitVec = hitMOP.hitVec; - closestEntity = 0.0D; - } + pickedEntity.hitVec = hitMOP.hitVec; + closestEntity = 0.0D; } } else { double distance = startingPosition.distanceTo(hitMOP.hitVec);