Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix possible NPE!

Browse Source
This commit is contained in:
YoyoNow
2024-08-07 09:33:31 +02:00
parent 704fc53e9e
commit 4efd30bdfb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
+9 -8
View File
@@ -61,16 +61,17 @@ public class TablistManager extends BasicListener {
@Subscribe @Subscribe
public void onJoin(PostLoginEvent event) { public void onJoin(PostLoginEvent event) {
synchronized (tablists) {
tablists.put(event.getPlayer(), new Tablist(event.getPlayer()));
}
Tablist.sendPacket(event.getPlayer(), Tablist.createTeamPacket); Tablist.sendPacket(event.getPlayer(), Tablist.createTeamPacket);
} }
@Subscribe @Subscribe
public void onServerConnection(ServerConnectedEvent event) { public void onServerConnection(ServerConnectedEvent event) {
synchronized (tablists) { synchronized (tablists) {
tablists.get(event.getPlayer()).onServerSwitch(); if (tablists.containsKey(event.getPlayer())) {
tablists.get(event.getPlayer()).onServerSwitch();
} else {
tablists.put(event.getPlayer(), new Tablist(event.getPlayer()));
}
} }
} }
@@ -98,14 +99,14 @@ public class TablistManager extends BasicListener {
private void updateTablist() { private void updateTablist() {
List<TablistPart> subservers = new ArrayList<>(); List<TablistPart> subservers = new ArrayList<>();
for (RegisteredServer server : new ArrayList<>(VelocityCore.getProxy().getAllServers())){ for (RegisteredServer server : new ArrayList<>(VelocityCore.getProxy().getAllServers())) {
if(server.getPlayersConnected().isEmpty()) if (server.getPlayersConnected().isEmpty())
continue; continue;
Subserver subserver = Subserver.getSubserver(server.getServerInfo()); Subserver subserver = Subserver.getSubserver(server.getServerInfo());
if(fightInfos.containsKey(server)) if (fightInfos.containsKey(server))
subservers.add(new TablistServer(server, fightInfos.get(server))); subservers.add(new TablistServer(server, fightInfos.get(server)));
else if(subserver == null || subserver.getType() != Servertype.BAUSERVER) else if (subserver == null || subserver.getType() != Servertype.BAUSERVER)
subservers.add(new TablistServer(server)); subservers.add(new TablistServer(server));
} }
subservers.add(new TablistBuild()); subservers.add(new TablistBuild());