SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
paper-server/nms-patches/net/minecraft/world/ChestLock.patch
View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/world/ChestLock.java
+++ b/net/minecraft/world/ChestLock.java
@@ -4,6 +4,11 @@
import net.minecraft.nbt.NBTTagCompound;
@@ -6,6 +6,11 @@
import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.world.item.ItemStack;
+// CraftBukkit start
@@ -9,27 +9,27 @@
+import org.bukkit.craftbukkit.util.CraftChatMessage;
+// CraftBukkit end
+
@Immutable
public class ChestLock {
public record ChestLock(String key) {
@@ -16,7 +21,19 @@
}
public static final ChestLock NO_LOCK = new ChestLock("");
@@ -18,7 +23,19 @@
} else {
IChatBaseComponent ichatbasecomponent = (IChatBaseComponent) itemstack.get(DataComponents.CUSTOM_NAME);
public boolean unlocksWith(ItemStack itemstack) {
- return this.key.isEmpty() || !itemstack.isEmpty() && itemstack.hasCustomHoverName() && this.key.equals(itemstack.getHoverName().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.hasCustomHoverName()) {
+ 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.getHoverName().getString());
+ } else {
+ // The lock key contains color codes, so let's take them into account:
+ return this.key.equals(CraftChatMessage.fromComponent(itemstack.getHoverName()));
- return ichatbasecomponent != null && this.key.equals(ichatbasecomponent.getString());
+ // CraftBukkit start - SPIGOT-6307: Check for color codes if the lock contains color codes
+ if (this.key.isEmpty()) return true;
+ if (ichatbasecomponent != null) {
+ 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(ichatbasecomponent.getString());
+ } else {
+ // The lock key contains color codes, so let's take them into account:
+ return this.key.equals(CraftChatMessage.fromComponent(ichatbasecomponent));
+ }
+ }
+ }
+ return false;
+ // CraftBukkit end
+ return false;
+ // CraftBukkit end
}
}
public void addToTag(NBTTagCompound nbttagcompound) {