amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-26 20:32:25 +00:00
Code Issues Projects Releases Wiki Activity

Added null check for shop item when updating visibility

Browse Source
This commit is contained in:
Eric 2016-08-20 12:41:27 +02:00
parent 6a96e235a6
commit f76ec6fe2d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/epiceric/shopchest/listeners/ShopItemListener.java
View File

@ -83,10 +83,12 @@ public class ShopItemListener implements Listener {
for (Shop shop : shopUtils.getShops()) { for (Shop shop : shopUtils.getShops()) {
Location shopLocation = shop.getLocation(); Location shopLocation = shop.getLocation();
if (w.equals(shopLocation.getWorld()) && shopLocation.distanceSquared(playerLocation) <= itemDistanceSquared) { if (w.equals(shopLocation.getWorld()) && shopLocation.distanceSquared(playerLocation) <= itemDistanceSquared) {
if (shop.getItem() != null) {
if (reset) shop.getItem().resetForPlayer(p); if (reset) shop.getItem().resetForPlayer(p);
else shop.getItem().setVisible(p, true); else shop.getItem().setVisible(p, true);
}
} else if (hideIfAway) { } else if (hideIfAway) {
shop.getItem().setVisible(p, false); if (shop.getItem() != null) shop.getItem().setVisible(p, false);
} }
} }
} }