diff --git a/pom.xml b/pom.xml index fb9092a..4856cdf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.lunarakai Minecleaner - 1.0.3c + 1.0.4 jar Minecleaner diff --git a/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java b/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java index 52d42a2..19205a1 100644 --- a/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java +++ b/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java @@ -600,10 +600,12 @@ public class MinecleanerArena { return blockDisplays; } - public int getSize() { + public int getArenaWidth() { return BoardSize.boardSizesWidth[widthIndex]; } + public int getArenaHeight() { return BoardSize.boardSizesHeight[widthIndex]; } + public long getCurrentGameStartTime() { return currentGameStartTime; } diff --git a/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java b/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java index dcb5783..57ae8fb 100644 --- a/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java +++ b/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java @@ -72,8 +72,12 @@ public class MinecleanerListener implements Listener { if(e.getAction() == Action.RIGHT_CLICK_BLOCK) { hasRightClicked = true; } + + if(blockzInt < arena.getArenaWidth() && blockxInt < arenaClicked.getArenaHeight()) { + plugin.getManager().handleFieldClick(e.getPlayer(), blockzInt, blockxInt, hasRightClicked); + } //player.sendMessage("Arena click! " + blockxInt + " " + blockzInt + " Right Clicked: " + hasRightClicked); - plugin.getManager().handleFieldClick(e.getPlayer(), blockzInt, blockxInt, hasRightClicked); + } } } diff --git a/src/main/java/de/lunarakai/minecleaner/utils/MinecleanerStringUtil.java b/src/main/java/de/lunarakai/minecleaner/utils/MinecleanerStringUtil.java index cefcf3d..e0e307a 100644 --- a/src/main/java/de/lunarakai/minecleaner/utils/MinecleanerStringUtil.java +++ b/src/main/java/de/lunarakai/minecleaner/utils/MinecleanerStringUtil.java @@ -30,6 +30,9 @@ public class MinecleanerStringUtil { } public static String percentageString(int whatPercentage, int fromPercentage) { + if(fromPercentage == 0) { + return "-"; + } float percent = (float) whatPercentage/fromPercentage; percent = percent * 100; String percentageString = String.format("%.1f", percent);