Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-01 14:07:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix block nbt update

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-05-23 23:40:57 +02:00
parent 025cdab7e6
commit f5dc048185
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -572,7 +572,7 @@ public class InstanceContainer extends Instance {
*/ */
private boolean isAlreadyChanged(@NotNull Point blockPosition, @NotNull Block block) { private boolean isAlreadyChanged(@NotNull Point blockPosition, @NotNull Block block) {
final Block changedBlock = currentlyChangingBlocks.get(blockPosition); final Block changedBlock = currentlyChangingBlocks.get(blockPosition);
return changedBlock != null && changedBlock.id() == block.id(); return Objects.equals(changedBlock, block);
} }
/** /**

26
src/test/java/net/minestom/server/instance/InstanceBlockIntegrationTest.java
View File

@ -2,7 +2,9 @@ package net.minestom.server.instance;
import net.minestom.server.api.Env; import net.minestom.server.api.Env;
import net.minestom.server.api.EnvTest; import net.minestom.server.api.EnvTest;
import net.minestom.server.coordinate.Vec;
import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.Block;
import net.minestom.server.tag.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -47,4 +49,28 @@ public class InstanceBlockIntegrationTest {
instance.loadChunk(0, 0).join(); instance.loadChunk(0, 0).join();
assertEquals(Block.AIR, instance.getBlock(0, 50, 0)); assertEquals(Block.AIR, instance.getBlock(0, 50, 0));
} }
@Test
public void blockNbt(Env env) {
var instance = env.createFlatInstance();
assertThrows(NullPointerException.class, () -> instance.getBlock(0, 0, 0),
"No exception throw when getting a block in an unloaded chunk");
instance.loadChunk(0, 0).join();
var tag = Tag.Integer("key");
var block = Block.STONE.withTag(tag, 5);
var point = new Vec(0, 50, 0);
// Initial placement
instance.setBlock(point, block);
assertEquals(5, instance.getBlock(point).getTag(tag));
// Override
instance.setBlock(point, block.withTag(tag, 7));
assertEquals(7, instance.getBlock(point).getTag(tag));
// Different block type
instance.setBlock(point, Block.GRASS.withTag(tag, 8));
assertEquals(8, instance.getBlock(point).getTag(tag));
}
} }