Merge branch 'master' into dev

This commit is contained in:
Myles 2017-05-27 20:41:19 +01:00
commit 24ab0d8590

View File

@ -36,7 +36,7 @@ public class PPSSubCmd extends ViaSubCommand {
if (!playerVersions.containsKey(playerVersion))
playerVersions.put(playerVersion, new HashSet<String>());
UserConnection uc = Via.getManager().getConnection(p.getUUID());
if (uc.getPacketsPerSecond() > -1) {
if (uc != null && uc.getPacketsPerSecond() > -1) {
playerVersions.get(playerVersion).add(p.getName() + " (" + uc.getPacketsPerSecond() + " PPS)");
totalPackets += uc.getPacketsPerSecond();
if (uc.getPacketsPerSecond() > max) {