From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks When modifying the world, CB will store a copy of the affected blocks in order to restore their state in the case that the event is cancelled. This change only modifies the collection of blocks in the world by normal means, e.g. not during tree population, as the potentially marginal overheads would serve no advantage. CB was using a CraftBlockState for all blocks, which causes issues should any block that uses information beyond a data ID would suffer from missing information, e.g. Skulls. By using CBs CraftBlock#getState(), we will maintain a proper copy of the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 16a87029aaa34601bc312db29925af1b0e568247..9c3c0a6ff57a8d1788cf6d7cd91571f4212eb701 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -71,7 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; - public Map capturedBlockStates = new HashMap<>(); + public Map capturedBlockStates = new HashMap<>(); // Paper public Map capturedTileEntities = new HashMap<>(); public List captureDrops; public long ticksPerAnimalSpawns; @@ -329,7 +329,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public boolean a(BlockPosition blockposition, IBlockData iblockdata, int i, int j) { // CraftBukkit start - tree generation if (this.captureTreeGeneration) { - CapturedBlockState blockstate = capturedBlockStates.get(blockposition); + CraftBlockState blockstate = capturedBlockStates.get(blockposition); if (blockstate == null) { blockstate = CapturedBlockState.getTreeBlockState(this, blockposition, i); this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate); @@ -349,7 +349,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // CraftBukkit start - capture blockstates boolean captured = false; if (this.captureBlockStates && !this.capturedBlockStates.containsKey(blockposition)) { - CapturedBlockState blockstate = CapturedBlockState.getBlockState(this, blockposition, i); + CraftBlockState blockstate = (CraftBlockState) world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getState(); // Paper - use CB getState to get a suitable snapshot this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate); captured = true; } @@ -607,7 +607,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public IBlockData getType(BlockPosition blockposition) { // CraftBukkit start - tree generation if (captureTreeGeneration) { - CapturedBlockState previous = capturedBlockStates.get(blockposition); + CraftBlockState previous = capturedBlockStates.get(blockposition); // Paper if (previous != null) { return previous.getHandle(); }