mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
d10ea572de
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
57 lines
No EOL
2.8 KiB
Diff
57 lines
No EOL
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 1 Sep 2018 11:29:52 +0100
|
|
Subject: [PATCH] fix newlines in spigot tab list API
|
|
|
|
Spigots implementation around the header/footer strips newlines from the
|
|
header/footer, this patch allows the tab list header/footer to retain newlines.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 912b2e6284..6c78c2e823 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
@Override
|
|
public void setPlayerListHeader(String header) {
|
|
- this.playerListHeader = CraftChatMessage.fromStringOrNull(header);
|
|
+ this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true); // Paper - fix up spigot tab API
|
|
updatePlayerListHeaderFooter();
|
|
}
|
|
|
|
@Override
|
|
public void setPlayerListFooter(String footer) {
|
|
- this.playerListFooter = CraftChatMessage.fromStringOrNull(footer);
|
|
+ this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true); // Paper - fix up spigot tab API
|
|
updatePlayerListHeaderFooter();
|
|
}
|
|
|
|
@Override
|
|
public void setPlayerListHeaderFooter(String header, String footer) {
|
|
- this.playerListHeader = CraftChatMessage.fromStringOrNull(header);
|
|
- this.playerListFooter = CraftChatMessage.fromStringOrNull(footer);
|
|
+ this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true); // Paper - fix up spigot tab API
|
|
+ this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true); // Paper - fix up spigot tab API
|
|
updatePlayerListHeaderFooter();
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
|
index a067e39d54..5e20a9a619 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
|
@@ -0,0 +0,0 @@ public final class CraftChatMessage {
|
|
}
|
|
|
|
public static IChatBaseComponent fromStringOrNull(String message) {
|
|
- return (message == null || message.isEmpty()) ? null : fromString(message)[0];
|
|
+ // Paper start - fix up spigot tab API
|
|
+ return fromStringOrNull(message, false);
|
|
+ }
|
|
+
|
|
+ public static IChatBaseComponent fromStringOrNull(String message, boolean keepNewlines) {
|
|
+ return (message == null || message.isEmpty()) ? null : fromString(message, keepNewlines)[0];
|
|
+ // Paper end - fix up spigot tab API
|
|
}
|
|
|
|
public static IChatBaseComponent[] fromString(String message) {
|
|
--
|