diff --git a/src/io/github/dre2n/dungeonsxl/sign/ChestSign.java b/src/io/github/dre2n/dungeonsxl/sign/ChestSign.java index 4b9f02ee..48e58fc5 100644 --- a/src/io/github/dre2n/dungeonsxl/sign/ChestSign.java +++ b/src/io/github/dre2n/dungeonsxl/sign/ChestSign.java @@ -13,17 +13,12 @@ public class ChestSign extends DSign { // Variables private double moneyReward; - public ChestSign(Sign sign, GameWorld gWorld) { - super(sign, gWorld); + public ChestSign(Sign sign, GameWorld gameWorld) { + super(sign, gameWorld); } @Override public boolean check() { - String lines[] = getSign().getLines(); - if (lines[1].equals("")) { - return false; - } - return true; } diff --git a/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java b/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java index 264d2d0b..6614b0ab 100644 --- a/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java +++ b/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java @@ -1,6 +1,5 @@ package io.github.dre2n.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DPlayer; @@ -53,27 +52,27 @@ public class ReadySign extends DSign { @Override public void onTrigger() { - for (DPlayer dplayer : DungeonsXL.getPlugin().getDPlayers()) { - ready(dplayer); + for (DPlayer dPlayer : plugin.getDPlayers()) { + ready(dPlayer); } } - private void ready(DPlayer dplayer) { - if (dplayer == null) { + private void ready(DPlayer dPlayer) { + if (dPlayer == null) { return; } - if (dplayer.isReady()) { + if (dPlayer.isReady()) { return; } - if (getGameWorld().getSignClass().isEmpty() || dplayer.getDClass() != null) { - dplayer.ready(); - MessageUtil.sendMessage(dplayer.getPlayer(), plugin.getDMessages().getMessage(Messages.PLAYER_READY)); + if (getGameWorld().getSignClass().isEmpty() || dPlayer.getDClass() != null) { + dPlayer.ready(); + MessageUtil.sendMessage(dPlayer.getPlayer(), plugin.getDMessages().getMessage(Messages.PLAYER_READY)); return; } else { - MessageUtil.sendMessage(dplayer.getPlayer(), plugin.getDMessages().getMessage(Messages.ERROR_READY)); + MessageUtil.sendMessage(dPlayer.getPlayer(), plugin.getDMessages().getMessage(Messages.ERROR_READY)); } }