Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-25 00:31:48 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NPE in FlagListener if provided location is null

Browse Source 
Fixes #585
This commit is contained in:
Florian CUNY 2019-03-01 20:54:50 +01:00
parent 98e0da6af2
commit f422a22f02
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java
View File

@ -103,11 +103,11 @@ public abstract class FlagListener implements Listener {
* Check if flag is allowed at location. Uses player object because Bukkit events provide player.
* @param e - event
* @param player - player affected by this flag, or null if none
* @param loc - location
* @param loc - location, will return true if null
* @param flag - flag {@link world.bentobox.bentobox.lists.Flags}
* @return true if allowed, false if not
*/
public boolean checkIsland(@NonNull Event e, @Nullable Player player, @NonNull Location loc, @NonNull Flag flag) {
public boolean checkIsland(@NonNull Event e, @Nullable Player player, @Nullable Location loc, @NonNull Flag flag) {
return checkIsland(e, player, loc, flag, false);
}
@ -115,17 +115,22 @@ public abstract class FlagListener implements Listener {
* Check if flag is allowed at location
* @param e - event
* @param player - player affected by this flag, or null if none
* @param loc - location
* @param loc - location, will return true if null
* @param flag - flag {@link world.bentobox.bentobox.lists.Flags}
* @param silent - if true, no attempt is made to tell the user
* @return true if the check is okay, false if it was disallowed
*/
public boolean checkIsland(@NonNull Event e, @Nullable Player player, @NonNull Location loc, @NonNull Flag flag, boolean silent) {
public boolean checkIsland(@NonNull Event e, @Nullable Player player, @Nullable Location loc, @NonNull Flag flag, boolean silent) {
// Set user
user = User.getInstance(player);
if (loc == null) {
// We cannot report that it's null here (#report(...) would throw a NPE)
return true;
}
// If this is not an Island World or a standard Nether or End, skip
if (!plugin.getIWM().inWorld(loc)) {
report(user, e, loc, flag, Why.UNPROTECTED_WORLD);
report(user, e, loc, flag, Why.UNPROTECTED_WORLD);
return true;
}
@ -162,7 +167,6 @@ public abstract class FlagListener implements Listener {
}
report(user, e, loc, flag, Why.NOT_ALLOWED_IN_WORLD);
noGo(e, flag, silent);
// Clear the user for the next time
return false;
}
@ -180,7 +184,6 @@ public abstract class FlagListener implements Listener {
}
report(user, e, loc, flag, Why.NOT_ALLOWED_ON_ISLAND);
noGo(e, flag, silent);
// Clear the user for the next time
return false;
}
// The player is in the world, but not on an island, so general world settings apply
@ -201,7 +204,6 @@ public abstract class FlagListener implements Listener {
plugin.log("Why: " + e.getEventName() + " in world " + loc.getWorld().getName() + " at " + Util.xyz(loc.toVector()));
plugin.log("Why: " + user.getName() + " " + flag.getID() + " - " + why.name());
}
}
/**