diff options
| author | Noah van der Aa <[email protected]> | 2024-04-30 00:16:07 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-30 00:16:07 +0200 |
| commit | 44ee092878a4a561fd565aa72cb5f2006ee64701 (patch) | |
| tree | 9c205d66741f572049804538f54837ddb4b1d4d5 /patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch | |
| parent | fbe3c006751aff00e2940a1e9b99bbf15c2f2a37 (diff) | |
| download | Paper-44ee092878a4a561fd565aa72cb5f2006ee64701.tar.gz Paper-44ee092878a4a561fd565aa72cb5f2006ee64701.zip | |
1.20.6 (#10623)
Diffstat (limited to 'patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch')
| -rw-r--r-- | patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch index 2ca3917af8..7a3041007e 100644 --- a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch @@ -13,10 +13,10 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index 0883e1755eae316faaeae8bf95763a0f80313c5a..90b218ebc947a1d8a8c7dfc677fe145b6386654a 100644 +index 8d281ce2a0e44b97957cea2992e273abc86bd157..d22cc83725cee3df20bb6f99de23aceb62923eef 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -57,6 +57,7 @@ public abstract class BlockEntity { +@@ -58,6 +58,7 @@ public abstract class BlockEntity { this.type = type; this.worldPosition = pos.immutable(); this.blockState = state; @@ -24,7 +24,7 @@ index 0883e1755eae316faaeae8bf95763a0f80313c5a..90b218ebc947a1d8a8c7dfc677fe145b } public static BlockPos getPosFromTag(CompoundTag nbt) { -@@ -78,7 +79,7 @@ public abstract class BlockEntity { +@@ -79,7 +80,7 @@ public abstract class BlockEntity { // CraftBukkit start - read container protected void loadAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) { @@ -33,7 +33,7 @@ index 0883e1755eae316faaeae8bf95763a0f80313c5a..90b218ebc947a1d8a8c7dfc677fe145b net.minecraft.nbt.Tag persistentDataTag = nbt.get("PublicBukkitValues"); if (persistentDataTag instanceof CompoundTag) { -@@ -342,8 +343,15 @@ public abstract class BlockEntity { +@@ -353,8 +354,15 @@ public abstract class BlockEntity { // CraftBukkit start - add method public InventoryHolder getOwner() { |