Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream Paper

Browse Source
This commit is contained in:
Sotr
2018-09-02 16:04:33 +08:00
parent 7c02d15374
commit 458d25a6ff
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -247,8 +247,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
setPlayerListHeader(header == null ? null : net.md_5.bungee.chat.ComponentSerializer.toString(header));
setPlayerListFooter(footer == null ? null : net.md_5.bungee.chat.ComponentSerializer.toString(footer));
if (header != null) {
String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
playerListHeader = net.minecraft.server.ChatBaseComponent.ChatSerializer.jsonToComponent(headerJson);
} else {
playerListHeader = null;
}
if (footer != null) {
String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
playerListFooter = net.minecraft.server.ChatBaseComponent.ChatSerializer.jsonToComponent(headerJson);
} else {
playerListFooter = null;
}
updatePlayerListHeaderFooter();
}
@Override
@@ -364,20 +377,20 @@ 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();
}

2
work/Paper

Submodule work/Paper updated: e84839f56d...e4376d3433