From 243749d1176ae8af0f694612d0e4aefda06192f9 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 25 Dec 2018 22:22:37 +0300 Subject: [PATCH] fix: ChunkDataPacketTest --- .../network/proto_1_12_2/packets/ChunkDataPacket.java | 6 +++--- .../network/proto_1_12_2/packets/ChunkDataPacketTest.java | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java index 18871ee..fe15f98 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java @@ -239,9 +239,9 @@ public class ChunkDataPacket implements SCPacket { void addBlock(Block block, int skyLight) { BlockLocation location = new BlockLocation( - block.getLocation().getX() - (block.getLocation().getX() >> 4) << 4, - block.getLocation().getY() - (block.getLocation().getY() >> 4) << 4, - block.getLocation().getZ() - (block.getLocation().getZ() >> 4) << 4 + block.getLocation().getX() - ((block.getLocation().getX() >> 4) << 4), + block.getLocation().getY() - ((block.getLocation().getY() >> 4) << 4), + block.getLocation().getZ() - ((block.getLocation().getZ() >> 4) << 4) ); blocks[coordsToIndex(location)] = addBlockType(block.getType()); blockLight.set(location, block.getLight()); diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java index 39d2b49..aea55bc 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java +++ b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java @@ -9,7 +9,6 @@ import mc.core.world.chunk.Chunk; import mc.core.world.chunk.ChunkSection; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -19,7 +18,6 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.*; -@Disabled //FIXME class ChunkDataPacketTest { private static DumbChunkData expectedDumbChunkData; private static DumbChunkData actualDumbChunkData; @@ -45,8 +43,8 @@ class ChunkDataPacketTest { } private static void verifyMock(Chunk chunk) { - verify(chunk).getX(); - verify(chunk).getZ(); + verify(chunk, atLeast(1)).getX(); + verify(chunk, atLeast(1)).getZ(); verify(chunk, times(256)).getBiome(anyInt(), anyInt()); verify(chunk, atLeast(2)).getChunkSection(anyInt()); } @@ -71,7 +69,7 @@ class ChunkDataPacketTest { @BeforeAll static void beforeClassTest() throws IOException { setupExpectedData(); - setupActualData(); // FIXME тест валится здесь + setupActualData(); } private static Block createChestBlock(BlockType type, int x, int y, int z, int height) {