icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes NPE when summoning a player with a banned account.

Browse Source
This commit is contained in:
gnembon committed 2020-11-22 21:47:32 -04:00
1 parent b8ca302d33
commit 190d17d1fe
1 file changed
+9 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/commands/PlayerCommand.java
+9 -3
View File
@@ -186,12 +186,18 @@ public class PlayerCommand
return true; return true;
} }
GameProfile profile = server.getUserCache().findByName(playerName); GameProfile profile = server.getUserCache().findByName(playerName);
if (manager.getUserBanList().contains(profile)) if (profile == null)
{ {
Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is banned"); Messenger.m(context.getSource(), "r Player "+playerName+" is either banned by Mojang, or auth servers are down. " +
"Banned players can only be summoned in Singleplayer and in servers in off-line mode.");
return true; return true;
} }
if (manager.isWhitelistEnabled() && profile != null && manager.isWhitelisted(profile) && !context.getSource().hasPermissionLevel(2)) if (manager.getUserBanList().contains(profile))
{
Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is banned on this server");
return true;
}
if (manager.isWhitelistEnabled() && manager.isWhitelisted(profile) && !context.getSource().hasPermissionLevel(2))
{ {
Messenger.m(context.getSource(), "r Whitelisted players can only be spawned by operators"); Messenger.m(context.getSource(), "r Whitelisted players can only be spawned by operators");
return true; return true;