Skip to content

Commit a9bd5be

Browse files
committed
Fix NPE when running /usepack from console
1 parent 661ac93 commit a9bd5be

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

core/src/main/java/de/themoep/resourcepacksplugin/core/commands/UsePackCommandExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public boolean execute(ResourcepacksPlayer sender, String[] args) {
5959
plugin.sendMessage(sender, ChatColor.GREEN + plugin.getMessage("packlisthead"));
6060
List<ResourcePack> packs = plugin.getPackManager().getPacks();
6161
if(packs.size() > 0) {
62-
ResourcePack userPack = plugin.getUserManager().getUserPack(sender.getUniqueId());
63-
List<ResourcePack> applicablePacks = new ArrayList<ResourcePack>();
62+
ResourcePack userPack = sender != null ? plugin.getUserManager().getUserPack(sender.getUniqueId()) : null;
63+
List<ResourcePack> applicablePacks = new ArrayList<>();
6464
for(ResourcePack pack : packs) {
65-
if(pack.getFormat() <= plugin.getPlayerPackFormat(sender.getUniqueId()) && plugin.checkPermission(sender, pack.getPermission())) {
65+
if(sender == null || pack.getFormat() <= plugin.getPlayerPackFormat(sender.getUniqueId()) && plugin.checkPermission(sender, pack.getPermission())) {
6666
applicablePacks.add(pack);
6767
}
6868
}

0 commit comments

Comments
 (0)