EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

I can't count + fix variable scope

Browse Source
This commit is contained in:
Jesse Boyd 2016-06-18 13:54:35 +10:00
parent 29ce4af350
commit 6375922808
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -74,7 +74,9 @@ public class Merge extends SubCommand {
final PlotArea plotArea = plot.getArea(); final PlotArea plotArea = plot.getArea();
Expression<Double> priceExr = plotArea.PRICES.containsKey("merge") ? plotArea.PRICES.get("merge") : null; Expression<Double> priceExr = plotArea.PRICES.containsKey("merge") ? plotArea.PRICES.get("merge") : null;
final int size = plot.getConnectedPlots().size(); final int size = plot.getConnectedPlots().size();
double price = priceExr == null ? 0d : priceExr.evalute((double) size); System.out.println("EXPRESSIONL " + priceExr);
final double price = priceExr == null ? 0d : priceExr.evalute((double) size);
System.out.println("PRICE: " + price + " | " + EconHandler.manager + " | " + plotArea.USE_ECONOMY);
if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d && EconHandler.manager.getMoney(player) < price) { if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d && EconHandler.manager.getMoney(player) < price) {
sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price)); sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
return false; return false;

2
Core/src/main/java/com/intellectualcrafters/plot/object/Expression.java
View File

@ -32,7 +32,7 @@ public abstract class Expression<T> {
} catch (Exception ignore) {} } catch (Exception ignore) {}
if (expression.endsWith("*{arg}")) { if (expression.endsWith("*{arg}")) {
try { try {
return linearDouble(Double.parseDouble(expression.substring(0, expression.length() - 8))); return linearDouble(Double.parseDouble(expression.substring(0, expression.length() - 6)));
} catch (Exception ignore) {} } catch (Exception ignore) {}
} }
return new Expression<Double>() { return new Expression<Double>() {