Minecraft/mc-server
Archived
0
Fork 0
Code Releases Activity

fix: ChunkDataPacketTest

Browse Source
This commit is contained in:
DmitriyMX
2018-12-25 22:22:37 +03:00
parent c1b8e2fa42
commit 243749d117
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
View File

@@ -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());

8
proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java
View File

@@ -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) {