Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Merge pull request 'Update Tablist colors' (#503) from TpAndTablist into master

Quellcode durchsuchen 
Reviewed-on: SteamWar/BungeeCore#503
Dieser Commit ist enthalten in:
Lixfel 2023-12-19 16:53:09 +01:00
Commit 1b3ed278c6
3 geänderte Dateien mit 53 neuen und 22 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -21,6 +21,8 @@ package de.steamwar.bungeecore.tablist;
import de.steamwar.bungeecore.Storage;
import de.steamwar.messages.ChatSender;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
@ -212,13 +214,24 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
break;
case ADD_PLAYER:
boolean playerNotOnTeamserver = !Storage.teamServers.containsValue(player.getServer().getInfo());
SteamwarUser viewee = SteamwarUser.get(player.getUniqueId());
for (PlayerListItem.Item item : list.getItems()) {
item.setPing(1);
if (playerNotOnTeamserver) {
item.setDisplayName(new TextComponent());
item.setListed(false);
} else if (item.getDisplayName() == null) {
item.setDisplayName(TextComponent.fromLegacy("§7" + item.getUsername()));
String color = "§f";
SteamwarUser steamwarUser = SteamwarUser.get(item.getUuid());
if (steamwarUser == null) {
color = "§7";
} else {
UserPerm.Prefix prefix = steamwarUser.prefix();
if (prefix != UserPerm.emptyPrefix || !TablistServer.hasTeamColor(viewee, item.getUuid())) {
color = prefix.getChatPrefix();
}
}
item.setDisplayName(TextComponent.fromLegacy(color + item.getUsername()));
}
item.setPublicKey(null);
if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
@ -264,6 +277,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
}
boolean playerNotOnTeamserver = !Storage.teamServers.containsValue(player.getServer().getInfo());
SteamwarUser viewee = SteamwarUser.get(player.getUniqueId());
for(PlayerListItemUpdate.Action action : actions) {
switch (action) {
case ADD_PLAYER:
@ -273,7 +287,17 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
item.setDisplayName(new TextComponent());
item.setListed(false);
} else if (item.getDisplayName() == null) {
item.setDisplayName(TextComponent.fromLegacy("§7" + item.getUsername()));
String color = "§f";
SteamwarUser steamwarUser = SteamwarUser.get(item.getUuid());
if (steamwarUser == null) {
color = "§7";
} else {
UserPerm.Prefix prefix = steamwarUser.prefix();
if (prefix != UserPerm.emptyPrefix || !TablistServer.hasTeamColor(viewee, item.getUuid())) {
color = prefix.getChatPrefix();
}
}
item.setDisplayName(TextComponent.fromLegacy(color + item.getUsername()));
}
item.setPublicKey(null);
if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)

12
src/de/steamwar/bungeecore/tablist/TablistBuild.java
Datei anzeigen

@ -22,6 +22,8 @@ package de.steamwar.bungeecore.tablist;
import de.steamwar.bungeecore.Servertype;
import de.steamwar.bungeecore.Subserver;
import de.steamwar.messages.ChatSender;
import de.steamwar.sql.SteamwarUser;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
@ -62,9 +64,15 @@ public class TablistBuild implements TablistPart {
tablist.add(new Item(null, viewer.parseToLegacy("TABLIST_BAU"), TablistServer.LIGHT_GRAY));
}
SteamwarUser steamwarUser = SteamwarUser.get(player.getUniqueId());
for (ServerInfo info : servers) {
TablistServer.teamify(players.get(info), player)
.forEach(((server == info) ? direct : tablist)::add);
players.get(info).forEach(item -> {
if (TablistServer.hasTeamColor(steamwarUser, item.getUuid())) {
ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
item = new Item(p, true);
}
(server == info ? direct : tablist).add(item);
});
}
}
}

35
src/de/steamwar/bungeecore/tablist/TablistServer.java
Datei anzeigen

@ -21,20 +21,16 @@ package de.steamwar.bungeecore.tablist;
import de.steamwar.bungeecore.Servertype;
import de.steamwar.bungeecore.Subserver;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.messages.ChatSender;
import de.steamwar.network.packets.common.FightInfoPacket;
import de.steamwar.sql.SteamwarUser;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.Property;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class TablistServer implements TablistPart {
@ -77,7 +73,14 @@ public class TablistServer implements TablistPart {
items.add(new Item(null, "§7§l" + server.getName(), LIGHT_GRAY));
}
teamify(players, player).forEach(items::add);
SteamwarUser steamwarUser = viewer.user();
for (Item item : players) {
if (hasTeamColor(steamwarUser, item.getUuid())) {
ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
item = new Item(p, true);
}
items.add(item);
}
}
private void addPlayers(String prefix, List<Integer> teamPlayers, Collection<ProxiedPlayer> onlinePlayers){
@ -88,16 +91,12 @@ public class TablistServer implements TablistPart {
).forEachOrdered(player -> players.add(new Item(player.getUniqueId(), prefix + player.getName(), Item.playerProperties(player))));
}
public static Stream<Item> teamify(List<Item> players, ProxiedPlayer player) {
int team = SteamwarUser.get(player.getUniqueId()).getTeam();
if (team == 0) return players.stream();
return players.stream().map(item -> {
ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
if (p == null) return item;
Subserver subserver = Subserver.getSubserver(p.getServer().getInfo());
if (subserver != null && subserver.getType() == Servertype.ARENA) return item;
if (SteamwarUser.get(p.getUniqueId()).getTeam() != team) return item;
return new Item(p, true);
});
public static boolean hasTeamColor(SteamwarUser viewer, UUID viewee) {
if (viewer.getTeam() == 0) return false;
ProxiedPlayer p = BungeeCord.getInstance().getPlayer(viewee);
if (p == null) return false;
Subserver subserver = Subserver.getSubserver(p.getServer().getInfo());
if (subserver != null && subserver.getType() == Servertype.ARENA) return false;
return SteamwarUser.get(p.getUniqueId()).getTeam() == viewer.getTeam();
}
}