(update) fix a npe when player disconnects from server without any chat prefixes attached
This commit is contained in:
1 file changed
+2
-1
@@ -43,12 +43,13 @@ public class ChatPrefixModule extends ServerModule {
|
|||||||
private void onDisconnect(ServerPlayNetworkHandler serverPlayNetworkHandler, MinecraftServer minecraftServer) {
|
private void onDisconnect(ServerPlayNetworkHandler serverPlayNetworkHandler, MinecraftServer minecraftServer) {
|
||||||
var player = serverPlayNetworkHandler.getPlayer();
|
var player = serverPlayNetworkHandler.getPlayer();
|
||||||
var current = getCurrentPrefix(player);
|
var current = getCurrentPrefix(player);
|
||||||
if (current.temporary()) {
|
if (current != null && current.temporary()) {
|
||||||
removeFromTeam(player, players.get(player.getUuid()));
|
removeFromTeam(player, players.get(player.getUuid()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onJoin(ServerPlayNetworkHandler networkHandler, PacketSender sender, MinecraftServer minecraftServer) {
|
private void onJoin(ServerPlayNetworkHandler networkHandler, PacketSender sender, MinecraftServer minecraftServer) {
|
||||||
|
applyPrefix(networkHandler.getPlayer(), empty);
|
||||||
for (Map.Entry<UUID, Team> uuidTeamEntry : players.entrySet()) {
|
for (Map.Entry<UUID, Team> uuidTeamEntry : players.entrySet()) {
|
||||||
var team = uuidTeamEntry.getValue();
|
var team = uuidTeamEntry.getValue();
|
||||||
sender.sendPacket(TeamS2CPacket.updateTeam(team, true));
|
sender.sendPacket(TeamS2CPacket.updateTeam(team, true));
|
||||||
|
|||||||
Reference in new issue
Block a user