rebase

patches/server/Adventure.patch

@@ -964,18 +964,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Nullable
      public static ChatFormatting getById(int colorIndex) {
          if (colorIndex < 0) {
-diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/nbt/CompoundTag.java
-+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
-@@ -0,0 +0,0 @@ public class CompoundTag implements Tag {
-     /**
-      * You must use {@link #hasUUID(String)} before or else it <b>will</b> throw an NPE.
-      */
--    public UUID getUUID(String prefix) { return getUUID(prefix); } // Paper - OBFHELPER
-     public UUID getUUID(String key) {
-         return NbtUtils.loadUUID(this.get(key));
-     }
 diff --git a/src/main/java/net/minecraft/nbt/StringTag.java b/src/main/java/net/minecraft/nbt/StringTag.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/nbt/StringTag.java
@@ -1045,15 +1033,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
                  try {
                      int i = friendlyByteBuf.writerIndex();
-@@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-                     }
-                 } catch (Throwable var9) {
-                     LOGGER.error(var9);
--                    throwable.printStackTrace(); // Paper - WHAT WAS IT? WHO DID THIS TO YOU? WHAT DID YOU SEE?
-+                    var9.printStackTrace(); // Paper - WHAT WAS IT? WHO DID THIS TO YOU? WHAT DID YOU SEE?
-                     if (packet.isSkippable()) {
-                         throw new SkipPacketException(var9);
-                     } else {
 diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/network/chat/Component.java