aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0440-Brand-support.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-12-11 22:02:06 -0800
committerGitHub <[email protected]>2023-12-11 22:02:06 -0800
commit7c2dc4b3429f16943300da0eb06100e910ad832e (patch)
tree395f09771ea04483c92771e7743ff0a2f7e0d6be /patches/server/0440-Brand-support.patch
parent82f9280ae46c16cd18cf21f4b0d7802328a36020 (diff)
downloadPaper-7c2dc4b3429f16943300da0eb06100e910ad832e.tar.gz
Paper-7c2dc4b3429f16943300da0eb06100e910ad832e.zip
Use Codecs for adventure Component conversions & network serialization (#10014)
* finish implementing all adventure components in codecs * add some initial tests * Add round trip tests for text and translatable components * Add more round trip test data (score component is failing) * Add more round trip test data * Fix SCORE_COMPONENT_MAP_CODEC * Improve test failure messages * Add failure cases * Add a couple more test data * Make use of AdventureCodecs * Update patches after rebase * Squash changes into adventure patch * Fix AT formatting * update comment --------- Co-authored-by: Jason Penilla <[email protected]>
Diffstat (limited to 'patches/server/0440-Brand-support.patch')
-rw-r--r--patches/server/0440-Brand-support.patch76
1 files changed, 76 insertions, 0 deletions
diff --git a/patches/server/0440-Brand-support.patch b/patches/server/0440-Brand-support.patch
new file mode 100644
index 0000000000..9db7930656
--- /dev/null
+++ b/patches/server/0440-Brand-support.patch
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: DigitalRegent <[email protected]>
+Date: Sat, 11 Apr 2020 13:10:58 +0200
+Subject: [PATCH] Brand support
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 25c5f23b859961c792b2ec08404171eea1aedba7..478abaffd1a80949b96f1c1774c98134be92e5ac 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
+ public boolean isRealPlayer; // Paper
+ public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
+ public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
++ public @Nullable String clientBrandName = null; // Paper - Brand name
+
+ // Paper start - replace player chunk loader
+ private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
+diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index 698fc66f8c232644f2d747c81f8ac2e39204fd7f..8cb7e9d67fc4713dc327ad0459518f062dc9264e 100644
+--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+@@ -54,6 +54,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ private int latency;
+ private volatile boolean suspendFlushingOnServerThread = false;
+ private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
++ protected static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
+
+ public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
+ this.server = minecraftserver;
+@@ -109,6 +110,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+
+ @Override
+ public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
++ // Paper start - handle brand payload packet
++ if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) {
++ this.player.clientBrandName = brandPayload.brand();
++ }
++ // Paper end - handle brand payload
+ if (!(packet.payload() instanceof ServerboundCustomPayloadPacket.UnknownPayload)) {
+ return;
+ }
+@@ -140,6 +146,15 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ try {
+ byte[] data = new byte[payload.readableBytes()];
+ payload.readBytes(data);
++ // Paper start - Brand support - Retain this incase upstream decides to 'break' the new mechanism in favour of backwards compat...
++ if (identifier.equals(MINECRAFT_BRAND)) {
++ try {
++ this.player.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.copiedBuffer(data)).readUtf(256);
++ } catch (StringIndexOutOfBoundsException ex) {
++ this.player.clientBrandName = "illegal";
++ }
++ }
++ // Paper end
+ this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), identifier.toString(), data);
+ } catch (Exception ex) {
+ ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index fb3b8f8eab00a2aadfee7780dfb0988f6fe3fc65..bb5c1a3ce83d737ac218a5b590b585916ac2d4d7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2999,6 +2999,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ // Paper end
+ };
+
++ // Paper start - brand support
++ @Override
++ public String getClientBrandName() {
++ return getHandle().clientBrandName;
++ }
++ // Paper end
++
+ public Player.Spigot spigot()
+ {
+ return this.spigot;