amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-08 19:51:05 +00:00
Code Issues Projects Releases Wiki Activity

Handle custom WorldGuard flags not existing

Browse Source 
Don't query and try to use flags if they haven't been registered
This commit is contained in:
Eric 2019-07-24 14:45:45 +02:00
parent e82c28e5e8
commit fed894a9b0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/epiceric/shopchest/external/listeners/WorldGuardListener.java vendored
View File

@ -70,6 +70,11 @@ public class WorldGuardListener implements Listener {
// } // }
private boolean handleForLocation(Player player, Location loc, Cancellable e, IWrappedFlag<WrappedState> flag) { private boolean handleForLocation(Player player, Location loc, Cancellable e, IWrappedFlag<WrappedState> flag) {
if (flag == null) {
// Flag may have not been registered successfully, so ignore them.
return false;
}
WrappedState state = wgWrapper.queryFlag(player, loc, flag).orElse(WrappedState.DENY); WrappedState state = wgWrapper.queryFlag(player, loc, flag).orElse(WrappedState.DENY);
if (state == WrappedState.DENY) { if (state == WrappedState.DENY) {
e.setCancelled(true); e.setCancelled(true);
@ -82,8 +87,8 @@ public class WorldGuardListener implements Listener {
private IWrappedFlag<WrappedState> getStateFlag(String flagName) { private IWrappedFlag<WrappedState> getStateFlag(String flagName) {
Optional<IWrappedFlag<WrappedState>> flagOptional = wgWrapper.getFlag(flagName, WrappedState.class); Optional<IWrappedFlag<WrappedState>> flagOptional = wgWrapper.getFlag(flagName, WrappedState.class);
if (!flagOptional.isPresent()) { if (!flagOptional.isPresent()) {
plugin.getLogger().severe("Failed to get WorldGuard flag '" + flagName + "'."); plugin.getLogger().severe("Failed to get WorldGuard state flag '" + flagName + "'.");
plugin.debug("WorldGuard flag '" + flagName + "' is not present!"); plugin.debug("WorldGuard state flag '" + flagName + "' is not present!");
return null; return null;
} }
return flagOptional.get(); return flagOptional.get();