Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-23 06:40:07 +01:00
93 Zeilen
4.6 KiB
Diff
93 Zeilen
4.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: DigitalRegent <misterwener@gmail.com>
|
||
|
Date: Sat, 11 Apr 2020 13:10:58 +0200
|
||
|
Subject: [PATCH] Brand support
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
index d264fca2737f83a0860394f7bb6b269ffe669594..ab6494f5a872bba5398bef0367b4d9257786f61e 100644
|
||
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
@@ -5,6 +5,7 @@ import com.google.common.primitives.Doubles;
|
||
|
import com.google.common.primitives.Floats;
|
||
|
import com.mojang.brigadier.ParseResults;
|
||
|
import com.mojang.brigadier.StringReader;
|
||
|
+import io.netty.buffer.Unpooled;
|
||
|
import io.netty.util.concurrent.Future;
|
||
|
import io.netty.util.concurrent.GenericFutureListener;
|
||
|
import it.unimi.dsi.fastutil.ints.Int2ShortMap;
|
||
|
@@ -37,6 +38,7 @@ import net.minecraft.nbt.ListTag;
|
||
|
import net.minecraft.nbt.StringTag;
|
||
|
import net.minecraft.nbt.Tag;
|
||
|
import net.minecraft.network.Connection;
|
||
|
+import net.minecraft.network.FriendlyByteBuf;
|
||
|
import net.minecraft.network.chat.ChatType;
|
||
|
import net.minecraft.network.chat.Component;
|
||
|
import net.minecraft.network.chat.MutableComponent;
|
||
|
@@ -258,6 +260,8 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80);
|
||
|
private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
|
||
|
|
||
|
+ private String clientBrandName = null; // Paper - Brand name
|
||
|
+
|
||
|
public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
|
||
|
this.server = server;
|
||
|
this.connection = connection;
|
||
|
@@ -2998,6 +3002,8 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register");
|
||
|
private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
|
||
|
|
||
|
+ private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
|
||
|
+
|
||
|
@Override
|
||
|
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
|
||
|
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
|
||
|
@@ -3025,6 +3031,16 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
try {
|
||
|
byte[] data = new byte[packet.data.readableBytes()];
|
||
|
packet.data.readBytes(data);
|
||
|
+
|
||
|
+ // Paper start - Brand support
|
||
|
+ if (packet.identifier.equals(MINECRAFT_BRAND)) {
|
||
|
+ try {
|
||
|
+ this.clientBrandName = new FriendlyByteBuf(Unpooled.copiedBuffer(data)).readUTF(256);
|
||
|
+ } catch (StringIndexOutOfBoundsException ex) {
|
||
|
+ this.clientBrandName = "illegal";
|
||
|
+ }
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
craftServer.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packet.identifier.toString(), data);
|
||
|
} catch (Exception ex) {
|
||
|
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
|
||
|
@@ -3034,6 +3050,12 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
|
||
|
}
|
||
|
|
||
|
+ // Paper start - brand support
|
||
|
+ public String getClientBrandName() {
|
||
|
+ return clientBrandName;
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
+
|
||
|
public final boolean isDisconnected() {
|
||
|
return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
|
||
|
}
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
index 610eabd2e93f9efccee810c3b5a314bc3cc649d8..7aae63d22167dc1b3ec7e8bc8672855c2038007e 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
@@ -2385,6 +2385,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
// Paper end
|
||
|
};
|
||
|
|
||
|
+ // Paper start - brand support
|
||
|
+ @Override
|
||
|
+ public String getClientBrandName() {
|
||
|
+ return getHandle().connection != null ? getHandle().connection.getClientBrandName() : null;
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
+
|
||
|
public Player.Spigot spigot()
|
||
|
{
|
||
|
return spigot;
|