From 6564cc89f4bb07a97a1f2c20e00551657ca82f3e Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 7 Nov 2020 17:46:38 +0000 Subject: [PATCH] Fix NPE when player gamemode or world is null --- .../bukkit/context/BukkitPlayerCalculator.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java index 72e0dd27d..7abf68fb9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/context/BukkitPlayerCalculator.java @@ -72,12 +72,19 @@ public class BukkitPlayerCalculator implements ContextCalculator, Listen this.plugin = plugin; } + @SuppressWarnings("ConstantConditions") // bukkit lies @Override public void calculate(@NonNull Player subject, @NonNull ContextConsumer consumer) { + GameMode mode = subject.getGameMode(); + if (mode != null) { + consumer.accept(DefaultContextKeys.GAMEMODE_KEY, GAMEMODE_NAMER.name(mode)); + } + World world = subject.getWorld(); - consumer.accept(DefaultContextKeys.GAMEMODE_KEY, GAMEMODE_NAMER.name(subject.getGameMode())); - consumer.accept(DefaultContextKeys.DIMENSION_TYPE_KEY, DIMENSION_TYPE_NAMER.name(world.getEnvironment())); - this.plugin.getConfiguration().get(ConfigKeys.WORLD_REWRITES).rewriteAndSubmit(world.getName(), consumer); + if (world != null) { + consumer.accept(DefaultContextKeys.DIMENSION_TYPE_KEY, DIMENSION_TYPE_NAMER.name(world.getEnvironment())); + this.plugin.getConfiguration().get(ConfigKeys.WORLD_REWRITES).rewriteAndSubmit(world.getName(), consumer); + } } @Override