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

Fixed NPE when creating a shop not in a PlotSquared plot

Browse Source
This commit is contained in:
Eric 2017-03-30 20:44:28 +02:00
parent 71e2c48cc2
commit 08f65dbee0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/epiceric/shopchest/utils/Utils.java
View File

@ -246,7 +246,7 @@ public class Utils {
* @return Whether the flag is allowed for the player
*/
public static boolean isFlagAllowedOnPlot(Plot plot, Flag flag, Player p) {
if (flag != null) {
if (plot != null && flag != null) {
Object o = plot.getFlag(flag, PlotSquaredShopFlag.Group.NONE);
if (o instanceof PlotSquaredShopFlag.Group) {
@ -267,7 +267,7 @@ public class Utils {
}
}
return false;
return true;
}
/**