Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
Unknown 2018-03-03 11:31:09 +01:00
parent 0e22c03d27
commit 6bbe69b631
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/cr0s/warpdrive/event/ChunkHandler.java
View file

@ -264,7 +264,7 @@ public class ChunkHandler {
} }
/** /**
* Return null if chunk isn't already generated or loaded * Return null if chunk isn't already generated or loaded
*/ */
private static ChunkData getChunkData(final boolean isRemote, final int dimensionId, final int x, final int y, final int z) { private static ChunkData getChunkData(final boolean isRemote, final int dimensionId, final int x, final int y, final int z) {
assert (y >= 0 && y <= 255); assert (y >= 0 && y <= 255);

9
src/main/java/cr0s/warpdrive/event/JumpSequencer.java
View file

@ -1399,8 +1399,8 @@ public class JumpSequencer extends AbstractSequencer {
} }
private CheckMovementResult checkCollisionAndProtection(ITransformation transformation, final boolean fullCollisionDetails, final String context) { private CheckMovementResult checkCollisionAndProtection(ITransformation transformation, final boolean fullCollisionDetails, final String context) {
CheckMovementResult result = new CheckMovementResult(); final CheckMovementResult result = new CheckMovementResult();
VectorI offset = new VectorI((int)Math.signum(moveX), (int)Math.signum(moveY), (int)Math.signum(moveZ)); final VectorI offset = new VectorI((int) Math.signum(moveX), (int) Math.signum(moveY), (int) Math.signum(moveZ));
int x, y, z; int x, y, z;
ChunkCoordinates coordTarget; ChunkCoordinates coordTarget;
@ -1446,8 +1446,9 @@ public class JumpSequencer extends AbstractSequencer {
} }
} }
if (blockSource != Blocks.air && CommonProxy.isBlockPlaceCanceled(null, coordCoreAtTarget.posX, coordCoreAtTarget.posY, coordCoreAtTarget.posZ, if ( blockSource != Blocks.air
targetWorld, coordTarget.posX, coordTarget.posY, coordTarget.posZ, blockSource, 0)) { && CommonProxy.isBlockPlaceCanceled(null, coordCoreAtTarget.posX, coordCoreAtTarget.posY, coordCoreAtTarget.posZ,
targetWorld, coordTarget.posX, coordTarget.posY, coordTarget.posZ, blockSource, 0) ) {
result.add(x, y, z, result.add(x, y, z,
coordTarget.posX, coordTarget.posX,
coordTarget.posY, coordTarget.posY,