Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Fixed rare problem while joining

Browse Source
This commit is contained in:
AlexDev_ 2024-01-16 22:51:23 +01:00
parent b37c760033
commit e496c99a52
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
View File

@ -29,6 +29,7 @@ import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
import com.velocitypowered.proxy.protocol.ProtocolUtils; import com.velocitypowered.proxy.protocol.ProtocolUtils;
import com.velocitypowered.proxy.protocol.StateRegistry; import com.velocitypowered.proxy.protocol.StateRegistry;
import net.william278.velocitab.Velocitab; import net.william278.velocitab.Velocitab;
import net.william278.velocitab.config.Group;
import net.william278.velocitab.player.TabPlayer; import net.william278.velocitab.player.TabPlayer;
import net.william278.velocitab.tab.Nametag; import net.william278.velocitab.tab.Nametag;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -85,6 +86,13 @@ public class ScoreboardManager {
} }
} }
public void resetCache(@NotNull Player player, @NotNull Group group) {
final String team = createdTeams.remove(player.getUniqueId());
if (team != null) {
dispatchGroupPacket(UpdateTeamsPacket.removeTeam(plugin, team), group);
}
}
public void vanishPlayer(@NotNull TabPlayer tabPlayer) { public void vanishPlayer(@NotNull TabPlayer tabPlayer) {
this.handleVanish(tabPlayer, true); this.handleVanish(tabPlayer, true);
} }
@ -217,6 +225,17 @@ public class ScoreboardManager {
} }
} }
private void dispatchGroupPacket(@NotNull UpdateTeamsPacket packet, @NotNull Group group) {
group.registeredServers(plugin).forEach(server -> server.getPlayersConnected().forEach(connected -> {
try {
final ConnectedPlayer connectedPlayer = (ConnectedPlayer) connected;
connectedPlayer.getConnection().write(packet);
} catch (Throwable e) {
plugin.log(Level.ERROR, "Failed to dispatch packet (unsupported client or server version)", e);
}
}));
}
private void dispatchGroupPacket(@NotNull UpdateTeamsPacket packet, @NotNull TabPlayer tabPlayer) { private void dispatchGroupPacket(@NotNull UpdateTeamsPacket packet, @NotNull TabPlayer tabPlayer) {
final Player player = tabPlayer.getPlayer(); final Player player = tabPlayer.getPlayer();
final Optional<ServerConnection> optionalServerConnection = player.getCurrentServer(); final Optional<ServerConnection> optionalServerConnection = player.getCurrentServer();

2
src/main/java/net/william278/velocitab/tab/TabListListener.java
View File

@ -61,13 +61,13 @@ public class TabListListener {
@Subscribe @Subscribe
public void onPlayerJoin(@NotNull ServerPostConnectEvent event) { public void onPlayerJoin(@NotNull ServerPostConnectEvent event) {
final Player joined = event.getPlayer(); final Player joined = event.getPlayer();
plugin.getScoreboardManager().ifPresent(manager -> manager.resetCache(joined));
final String serverName = joined.getCurrentServer() final String serverName = joined.getCurrentServer()
.map(ServerConnection::getServerInfo) .map(ServerConnection::getServerInfo)
.map(ServerInfo::getName) .map(ServerInfo::getName)
.orElse(""); .orElse("");
final Group group = tabList.getGroup(serverName); final Group group = tabList.getGroup(serverName);
plugin.getScoreboardManager().ifPresent(manager -> manager.resetCache(joined, group));
final boolean isDefault = !group.servers().contains(serverName); final boolean isDefault = !group.servers().contains(serverName);
// If the server is not in a group, use fallback. // If the server is not in a group, use fallback.