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

Fixed error when clicking an entity that is not an ArmorStand

Browse Source 
(only occurred with WorldGuard)
This commit is contained in:
Eric 2017-01-06 13:21:06 +01:00
parent c78f81a1b6
commit 39e3b4f837
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/epiceric/shopchest/listeners/WorldGuardListener.java
View File

@ -84,11 +84,12 @@ public class WorldGuardListener implements Listener {
if (event.getOriginalEvent() instanceof PlayerInteractAtEntityEvent) { if (event.getOriginalEvent() instanceof PlayerInteractAtEntityEvent) {
PlayerInteractAtEntityEvent orig = (PlayerInteractAtEntityEvent) event.getOriginalEvent(); PlayerInteractAtEntityEvent orig = (PlayerInteractAtEntityEvent) event.getOriginalEvent();
Entity e = orig.getRightClicked(); Entity e = orig.getRightClicked();
if (!Hologram.isPartOfHologram((ArmorStand) e)) return;
if (e.getType() == EntityType.ARMOR_STAND) { if (e.getType() == EntityType.ARMOR_STAND) {
if (!Hologram.isPartOfHologram((ArmorStand) e))
return;
for (Shop shop : plugin.getShopUtils().getShops()) { for (Shop shop : plugin.getShopUtils().getShops()) {
if (shop.getHologram().contains((ArmorStand) e)) { if (shop.getHologram().contains((ArmorStand) e)) {
if (isAllowed(player, shop.getLocation(), Action.RIGHT_CLICK_BLOCK)) { if (isAllowed(player, shop.getLocation(), Action.RIGHT_CLICK_BLOCK)) {
@ -112,11 +113,12 @@ public class WorldGuardListener implements Listener {
if (event.getOriginalEvent() instanceof EntityDamageByEntityEvent) { if (event.getOriginalEvent() instanceof EntityDamageByEntityEvent) {
EntityDamageByEntityEvent orig = (EntityDamageByEntityEvent) event.getOriginalEvent(); EntityDamageByEntityEvent orig = (EntityDamageByEntityEvent) event.getOriginalEvent();
Entity e = orig.getEntity(); Entity e = orig.getEntity();
if (!Hologram.isPartOfHologram((ArmorStand) e)) return;
if (e.getType() == EntityType.ARMOR_STAND) { if (e.getType() == EntityType.ARMOR_STAND) {
if (!Hologram.isPartOfHologram((ArmorStand) e))
return;
for (Shop shop : plugin.getShopUtils().getShops()) { for (Shop shop : plugin.getShopUtils().getShops()) {
if (shop.getHologram().contains((ArmorStand) e)) { if (shop.getHologram().contains((ArmorStand) e)) {
if (isAllowed(player, shop.getLocation(), Action.LEFT_CLICK_BLOCK)) { if (isAllowed(player, shop.getLocation(), Action.LEFT_CLICK_BLOCK)) {