From bb71e8ae04381f60a00a93c735b9ce933a492453 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Fri, 13 Jul 2018 23:31:15 +0200 Subject: [PATCH] Update to Caliburn 0.4.4 --- pom.xml | 2 +- .../java/de/erethon/dungeonsxl/command/PortalCommand.java | 2 +- .../java/de/erethon/dungeonsxl/reward/RewardListener.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ade2fc4a..6a697479 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ de.erethon caliburn - 0.4.2 + 0.4.4 compile diff --git a/src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java b/src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java index 6d5d3440..e2cd1a5b 100644 --- a/src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java @@ -64,7 +64,7 @@ public class PortalCommand extends DRECommand { } if (material == null) { - material = VanillaItem.PORTAL; + material = VanillaItem.NETHER_PORTAL; } DPortal dPortal = dGlobalPlayer.getPortal(); diff --git a/src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java b/src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java index 1441b860..8b700e28 100644 --- a/src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java @@ -114,9 +114,9 @@ public class RewardListener implements Listener { return; } Block block = player.getLocation().getBlock(); - if (dPlayer.hasRewardItemsLeft() && !VanillaItem.PORTAL.is(block.getRelative(0, 1, 0)) && !VanillaItem.PORTAL.is(block.getRelative(0, -1, 0)) - && !VanillaItem.PORTAL.is(block.getRelative(1, 0, 0)) && !VanillaItem.PORTAL.is(block.getRelative(-1, 0, 0)) - && !VanillaItem.PORTAL.is(block.getRelative(0, 0, 1)) && !VanillaItem.PORTAL.is(block.getRelative(0, 0, -1))) { + if (dPlayer.hasRewardItemsLeft() && !VanillaItem.NETHER_PORTAL.is(block.getRelative(0, 1, 0)) && !VanillaItem.NETHER_PORTAL.is(block.getRelative(0, -1, 0)) + && !VanillaItem.NETHER_PORTAL.is(block.getRelative(1, 0, 0)) && !VanillaItem.NETHER_PORTAL.is(block.getRelative(-1, 0, 0)) + && !VanillaItem.NETHER_PORTAL.is(block.getRelative(0, 0, 1)) && !VanillaItem.NETHER_PORTAL.is(block.getRelative(0, 0, -1))) { PageGUI lootInventory = new PageGUI(DMessage.PLAYER_TREASURES.getMessage(), true); for (ItemStack item : dPlayer.getRewardItems()) { if (item != null) {