Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-03 05:51:38 +01:00
Code Issues Projects Releases Wiki Activity

Update to Caliburn 0.4.4

Browse Source
This commit is contained in:
Daniel Saukel 2018-07-13 23:31:15 +02:00
parent 07b68397f3
commit bb71e8ae04
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -77,7 +77,7 @@
<dependency> <dependency>
<groupId>de.erethon</groupId> <groupId>de.erethon</groupId>
<artifactId>caliburn</artifactId> <artifactId>caliburn</artifactId>
<version>0.4.2</version> <version>0.4.4</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java
View File

@ -64,7 +64,7 @@ public class PortalCommand extends DRECommand {
} }
if (material == null) { if (material == null) {
material = VanillaItem.PORTAL; material = VanillaItem.NETHER_PORTAL;
} }
DPortal dPortal = dGlobalPlayer.getPortal(); DPortal dPortal = dGlobalPlayer.getPortal();

6
src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java
View File

@ -114,9 +114,9 @@ public class RewardListener implements Listener {
return; return;
} }
Block block = player.getLocation().getBlock(); Block block = player.getLocation().getBlock();
if (dPlayer.hasRewardItemsLeft() && !VanillaItem.PORTAL.is(block.getRelative(0, 1, 0)) && !VanillaItem.PORTAL.is(block.getRelative(0, -1, 0)) if (dPlayer.hasRewardItemsLeft() && !VanillaItem.NETHER_PORTAL.is(block.getRelative(0, 1, 0)) && !VanillaItem.NETHER_PORTAL.is(block.getRelative(0, -1, 0))
&& !VanillaItem.PORTAL.is(block.getRelative(1, 0, 0)) && !VanillaItem.PORTAL.is(block.getRelative(-1, 0, 0)) && !VanillaItem.NETHER_PORTAL.is(block.getRelative(1, 0, 0)) && !VanillaItem.NETHER_PORTAL.is(block.getRelative(-1, 0, 0))
&& !VanillaItem.PORTAL.is(block.getRelative(0, 0, 1)) && !VanillaItem.PORTAL.is(block.getRelative(0, 0, -1))) { && !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); PageGUI lootInventory = new PageGUI(DMessage.PLAYER_TREASURES.getMessage(), true);
for (ItemStack item : dPlayer.getRewardItems()) { for (ItemStack item : dPlayer.getRewardItems()) {
if (item != null) { if (item != null) {