SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Don't ignore newlines in PlayerListHeader/Footer

Quellcode durchsuchen 
By: Yannick Lamprecht <yannicklamprecht@live.de>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2019-03-10 11:04:15 +11:00
Ursprung d8321eeba1
Commit 6caa3d0de8
2 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Datei anzeigen

@ -243,20 +243,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public void setPlayerListHeader(String header) { public void setPlayerListHeader(String header) {
this.playerListHeader = CraftChatMessage.fromStringOrNull(header); this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true);
updatePlayerListHeaderFooter(); updatePlayerListHeaderFooter();
} }
@Override @Override
public void setPlayerListFooter(String footer) { public void setPlayerListFooter(String footer) {
this.playerListFooter = CraftChatMessage.fromStringOrNull(footer); this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true);
updatePlayerListHeaderFooter(); updatePlayerListHeaderFooter();
} }
@Override @Override
public void setPlayerListHeaderFooter(String header, String footer) { public void setPlayerListHeaderFooter(String header, String footer) {
this.playerListHeader = CraftChatMessage.fromStringOrNull(header); this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true);
this.playerListFooter = CraftChatMessage.fromStringOrNull(footer); this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true);
updatePlayerListHeaderFooter(); updatePlayerListHeaderFooter();
} }

6
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
Datei anzeigen

@ -143,7 +143,11 @@ public final class CraftChatMessage {
} }
public static IChatBaseComponent fromStringOrNull(String message) { public static IChatBaseComponent fromStringOrNull(String message) {
return (message == null || message.isEmpty()) ? null : fromString(message)[0]; return fromStringOrNull(message, false);
}
public static IChatBaseComponent fromStringOrNull(String message, boolean keepNewlines) {
return (message == null || message.isEmpty()) ? null : fromString(message, keepNewlines)[0];
} }
public static IChatBaseComponent[] fromString(String message) { public static IChatBaseComponent[] fromString(String message) {