SteamWar/BungeeCore
SteamWar/BungeeCore
Archiviert
13
2
Fork 1
Code Issues 14 Pull-Requests 4 Releases Wiki Aktivität

Tablist fix
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen 
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Lixfel 2023-12-06 11:57:35 +01:00
Ursprung 3ea910501a
Commit 74cf9d4657
1 geänderte Dateien mit 10 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

16
src/de/steamwar/bungeecore/tablist/Tablist.java
Datei anzeigen

@ -89,8 +89,8 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
if(tabItem == null) { if(tabItem == null) {
tablist.add(0, item); tablist.add(0, item);
} else if(!tabItem.getDisplayName().equals(item.getDisplayName())) { } else if(!tabItem.getDisplayName().equals(wrapName(item.getDisplayName()))) {
tabItem.setDisplayName(TextComponent.fromLegacy(item.getDisplayName())); tabItem.setDisplayName(wrapName(item.getDisplayName()));
tabItem.setListed(true); tabItem.setListed(true);
update.add(tabItem); update.add(tabItem);
} }
@ -126,13 +126,13 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
TablistPart.Item item = tablist.get(i); TablistPart.Item item = tablist.get(i);
if(!Arrays.equals(tabItem.getProperties(), item.getProperties())) { if(!Arrays.equals(tabItem.getProperties(), item.getProperties())) {
tabItem.setProperties(item.getProperties()); tabItem.setProperties(item.getProperties());
tabItem.setDisplayName(TextComponent.fromLegacy(item.getDisplayName())); tabItem.setDisplayName(wrapName(item.getDisplayName()));
add.add(tabItem); add.add(tabItem);
if(current.size() > i) { if(current.size() > i) {
remove.add(tabItem); remove.add(tabItem);
} }
} else if(!item.getDisplayName().equals(tabItem.getDisplayName())) { } else if(!item.getDisplayName().equals(tabItem.getDisplayName())) {
tabItem.setDisplayName(TextComponent.fromLegacy(item.getDisplayName())); tabItem.setDisplayName(wrapName(item.getDisplayName()));
update.add(tabItem); update.add(tabItem);
} }
} }
@ -212,7 +212,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
case ADD_PLAYER: case ADD_PLAYER:
for (PlayerListItem.Item item : list.getItems()) { for (PlayerListItem.Item item : list.getItems()) {
item.setPing(1); item.setPing(1);
item.setDisplayName(TextComponent.fromLegacy("")); item.setDisplayName(wrapName(""));
item.setListed(false); item.setListed(false);
item.setPublicKey(null); item.setPublicKey(null);
if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3) if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
@ -262,7 +262,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
case ADD_PLAYER: case ADD_PLAYER:
for (PlayerListItem.Item item : list.getItems()) { for (PlayerListItem.Item item : list.getItems()) {
item.setPing(1); item.setPing(1);
item.setDisplayName(TextComponent.fromLegacy("")); item.setDisplayName(wrapName(""));
item.setListed(false); item.setListed(false);
item.setPublicKey(null); item.setPublicKey(null);
if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3) if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
@ -304,6 +304,10 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
return player.getPendingConnection().getVersion() < ProtocolConstants.MINECRAFT_1_19_3; return player.getPendingConnection().getVersion() < ProtocolConstants.MINECRAFT_1_19_3;
} }
private BaseComponent wrapName(String name) {
return new TextComponent(TextComponent.fromLegacyText(name));
}
private void sendTabPacket(List<PlayerListItem.Item> items, PlayerListItem.Action action) { //Breaks in 1.19.3 if action != UPDATE_DISPLAY_NAME, ADD_PLAYER or REMOVE_PLAYER private void sendTabPacket(List<PlayerListItem.Item> items, PlayerListItem.Action action) { //Breaks in 1.19.3 if action != UPDATE_DISPLAY_NAME, ADD_PLAYER or REMOVE_PLAYER
if(!items.isEmpty()) { if(!items.isEmpty()) {
if(oldTab()) { if(oldTab()) {