aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-10-21 00:31:49 +0200
committerBjarne Koll <[email protected]>2024-10-21 00:31:49 +0200
commit73f7394ac5d86818a0a80ad1efa4a5512c882078 (patch)
tree7c8303362f330739bdc890d8c3a1106126a52c07
parentfbf7d70b21e634c7a24550832f20bc6525ba68c6 (diff)
downloadPaper-73f7394ac5d86818a0a80ad1efa4a5512c882078.tar.gz
Paper-73f7394ac5d86818a0a80ad1efa4a5512c882078.zip
Grab from threadlocalfix/banner-be-patterns
-rw-r--r--patches/server/1068-Always-send-Banner-patterns-to-the-client.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/1068-Always-send-Banner-patterns-to-the-client.patch b/patches/server/1068-Always-send-Banner-patterns-to-the-client.patch
index 78daca3ba4..8672bed6d3 100644
--- a/patches/server/1068-Always-send-Banner-patterns-to-the-client.patch
+++ b/patches/server/1068-Always-send-Banner-patterns-to-the-client.patch
@@ -9,7 +9,7 @@ flow for them, this is not all too surprising. So, we shall resort to always
sending the patterns over the network for update packets.
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
-index 60c26076e7acf869fa0e20fdc14eeec341387d99..5ddada37ad0d4c19438cd02415bad628012f7c90 100644
+index 60c26076e7acf869fa0e20fdc14eeec341387d99..60a9f3c7f007d268f24a4fe9e87029fdbc8360f9 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
@@ -63,7 +63,7 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
@@ -17,7 +17,7 @@ index 60c26076e7acf869fa0e20fdc14eeec341387d99..5ddada37ad0d4c19438cd02415bad628
protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {
super.saveAdditional(nbt, registryLookup);
- if (!this.patterns.equals(BannerPatternLayers.EMPTY)) {
-+ if (!this.patterns.equals(BannerPatternLayers.EMPTY) || serialisingForNetwork) { // Paper - always send patterns to client
++ if (!this.patterns.equals(BannerPatternLayers.EMPTY) || serialisingForNetwork.get()) { // Paper - always send patterns to client
nbt.put("patterns", (Tag) BannerPatternLayers.CODEC.encodeStart(registryLookup.createSerializationContext(NbtOps.INSTANCE), this.patterns).getOrThrow());
}