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

remove java 8 code

Browse Source
This commit is contained in:
Jesse Boyd 2016-03-08 14:09:43 +11:00
parent 286e5b8b97
commit f391ae444f
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
View File

@ -44,11 +44,6 @@ public abstract class HybridUtils {
public abstract void analyzeRegion(final String world, final RegionWrapper region, final RunnableVal<PlotAnalysis> whenDone); public abstract void analyzeRegion(final String world, final RegionWrapper region, final RunnableVal<PlotAnalysis> whenDone);
public void analyzePlot(final Plot origin, 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 ArrayDeque<RegionWrapper> zones = new ArrayDeque<>(origin.getRegions());
final ArrayList<PlotAnalysis> analysis = new ArrayList<>(); final ArrayList<PlotAnalysis> analysis = new ArrayList<>();
Runnable run = new Runnable() { Runnable run = new Runnable() {

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

@ -699,7 +699,7 @@ public abstract class PlotArea {
public boolean mergePlots(final PlotPlayer player, final ArrayList<PlotId> plotIds) { public boolean mergePlots(final PlotPlayer player, final ArrayList<PlotId> plotIds) {
if (EconHandler.manager != null && USE_ECONOMY) { 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 (cost > 0d) {
if (EconHandler.manager.getMoney(player) < cost) { if (EconHandler.manager.getMoney(player) < cost) {
MainUtil.sendMessage(player, C.CANNOT_AFFORD_MERGE, "" + cost); MainUtil.sendMessage(player, C.CANNOT_AFFORD_MERGE, "" + cost);