From f391ae444f893b52bbe325b734eb480a91467820 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 8 Mar 2016 14:09:43 +1100
Subject: [PATCH] remove java 8 code

---
 .../com/intellectualcrafters/plot/generator/HybridUtils.java | 5 -----
 .../java/com/intellectualcrafters/plot/object/PlotArea.java  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java b/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
index 1102f82b6..249963fa1 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
@@ -44,11 +44,6 @@ public abstract class HybridUtils {
     public abstract void analyzeRegion(final String world, final RegionWrapper region, final RunnableVal<PlotAnalysis> whenDone);
 
     public void analyzePlot(final Plot origin, final RunnableVal<PlotAnalysis> whenDone) {
-        PlotAnalysis existing = origin.getComplexity();
-        if (existing != null) {
-            whenDone.run(existing);
-            return;
-        }
         final ArrayDeque<RegionWrapper> zones = new ArrayDeque<>(origin.getRegions());
         final ArrayList<PlotAnalysis> analysis = new ArrayList<>();
         Runnable run = new Runnable() {
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java
index 4c5b1cf58..34a219566 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java
@@ -699,7 +699,7 @@ public abstract class PlotArea {
     
     public boolean mergePlots(final PlotPlayer player, final ArrayList<PlotId> plotIds) {
         if (EconHandler.manager != null && USE_ECONOMY) {
-            final double cost = plotIds.size() * PRICES.getOrDefault("merge", 0d);
+            final double cost = plotIds.size() * (PRICES.containsKey("merge") ? PRICES.get("merge") : 0);
             if (cost > 0d) {
                 if (EconHandler.manager.getMoney(player) < cost) {
                     MainUtil.sendMessage(player, C.CANNOT_AFFORD_MERGE, "" + cost);