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

Minor fixes for chest & ready signs

Browse Source
This commit is contained in:
Daniel Saukel 2016-01-10 16:53:44 +01:00
parent ffbaac5bb3
commit 262eceabfa
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/io/github/dre2n/dungeonsxl/sign/ChestSign.java
View File

@ -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;
}

19
src/io/github/dre2n/dungeonsxl/sign/ReadySign.java
View File

@ -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));
}
}