Repackage patches

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
--- a/paper-server/nms-patches/net/minecraft/world/ChestLock.patch
+++ b/paper-server/nms-patches/net/minecraft/world/ChestLock.patch
@@ -0,0 +1,35 @@
+--- a/net/minecraft/server/ChestLock.java
+++ b/net/minecraft/server/ChestLock.java
+@@ -2,6 +2,11 @@
+ 
+ import javax.annotation.concurrent.Immutable;
+ 
+// CraftBukkit start
+import org.bukkit.ChatColor;
+import org.bukkit.craftbukkit.util.CraftChatMessage;
+// CraftBukkit end
+
+ @Immutable
+ public class ChestLock {
+ 
+@@ -13,7 +18,19 @@
+     }
+ 
+     public boolean a(ItemStack itemstack) {
+-        return this.key.isEmpty() || !itemstack.isEmpty() && itemstack.hasName() && this.key.equals(itemstack.getName().getString());
+        // CraftBukkit start - SPIGOT-6307: Check for color codes if the lock contains color codes
+        if (this.key.isEmpty()) return true;
+        if (!itemstack.isEmpty() && itemstack.hasName()) {
+            if (this.key.indexOf(ChatColor.COLOR_CHAR) == -1) {
+                // The lock key contains no color codes, so let's ignore colors in the item display name (vanilla Minecraft behavior):
+                return this.key.equals(itemstack.getName().getString());
+            } else {
+                // The lock key contains color codes, so let's take them into account:
+                return this.key.equals(CraftChatMessage.fromComponent(itemstack.getName()));
+            }
+        }
+        return false;
+        // CraftBukkit end
+     }
+ 
+     public void a(NBTTagCompound nbttagcompound) {