Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
2f34301581
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) 1dc91b15 Add specific notes about what is not API 2b05ef88 #484: Allow statistics to be accessed for offline players CraftBukkit Changes:f7d6ad53SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable5838285dSPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooksf325b9beSPIGOT-5641: Add Block.getDrops(ItemStack, Entity)e25a2272Fix some formatting in CraftHumanEntity498540e0Add Merchant slot delegateb2de47d5SPIGOT-5621: Add missing container types for opening InventoryViewaa3a2f27#645: Allow statistics to be accessed for offline players2122c0b1#649: CraftBell should implement Bell
63 Zeilen
3.6 KiB
Diff
63 Zeilen
3.6 KiB
Diff
From acb4e329c24a42d0fa90ca0f05b0a24e885c97c5 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
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 a956dbc3d4..2f57c7bc76 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
|
|
public boolean captureBlockStates = false;
|
|
public boolean captureTreeGeneration = false;
|
|
- public Map<BlockPosition, CapturedBlockState> capturedBlockStates = new HashMap<>();
|
|
+ public Map<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new HashMap<>(); // Paper
|
|
public Map<BlockPosition, TileEntity> capturedTileEntities = new HashMap<>();
|
|
public List<EntityItem> captureDrops;
|
|
public long ticksPerAnimalSpawns;
|
|
@@ -257,7 +257,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
public boolean setTypeAndData(BlockPosition blockposition, IBlockData iblockdata, int i) {
|
|
// 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);
|
|
@@ -277,7 +277,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;
|
|
}
|
|
@@ -545,7 +545,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();
|
|
}
|
|
--
|
|
2.25.1
|
|
|