Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-15 23:23:08 -03:00
commit 8997785460
4 files changed
+72 -9

No files matched your search

@@ -171,7 +171,7 @@ public class SettingsManager
public void notifyPlayersCommandsChanged()
{
if (server.getPlayerManager() == null)
if (server == null || server.getPlayerManager() == null)
{
return;
}