From 7841ee3dcc3fc8ea437b4585d92cd99e417c2f8e Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Thu, 2 Apr 2020 13:40:11 +0100 Subject: [PATCH] Fix a few encapsulate merge issues --- .../plotsquared/plot/PlotSquared.java | 10 +++++----- .../plotsquared/plot/generator/HybridPlotManager.java | 2 +- .../plotsquared/plot/generator/HybridUtils.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java index 2e0f5ac86..c909ccc1a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java @@ -468,8 +468,8 @@ import java.util.zip.ZipInputStream; return; } File file = new File( - this.IMP.getDirectory() + File.separator + "persistent_regen_data_" + plotArea.id + "_" - + plotArea.worldname); + this.IMP.getDirectory() + File.separator + "persistent_regen_data_" + plotArea.getId() + "_" + + plotArea.getWorldName()); if (!file.exists()) { return; } @@ -485,7 +485,7 @@ import java.util.zip.ZipInputStream; int height = (int) list.get(2); PlotSquared.log( Captions.PREFIX + "Incomplete road regeneration found. Restarting in world " - + plotArea.worldname + " with height " + height + "."); + + plotArea.getWorldName() + " with height " + height + "."); PlotSquared.debug(" Regions: " + regions.size()); PlotSquared.debug(" Chunks: " + chunks.size()); HybridUtils.UPDATE = true; @@ -496,7 +496,7 @@ import java.util.zip.ZipInputStream; } finally { if (!file.delete()) { PlotSquared.log( - Captions.PREFIX + "Error deleting persistent_regen_data_" + plotArea.id + Captions.PREFIX + "Error deleting persistent_regen_data_" + plotArea.getId() + ". Please manually delete this file."); } } @@ -1563,7 +1563,7 @@ import java.util.zip.ZipInputStream; list.add(chunks); list.add(HybridUtils.height); File file = new File(this.IMP.getDirectory() + File.separator + "persistent_regen_data_" - + HybridUtils.area.id + "_" + HybridUtils.area.worldname); + + HybridUtils.area.getId() + "_" + HybridUtils.area.getWorldName()); if (file.exists() && !file.delete()) { PlotSquared.log(Captions.PREFIX + "persistent_regen_data file already exists and could not be deleted."); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java index bcdca4424..2fb06cc15 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java @@ -124,7 +124,7 @@ public class HybridPlotManager extends ClassicPlotManager { if (biome != null) { queue.setBiome(x, z, biome); } else { - queue.setBiome(x, z, hybridPlotWorld.PLOT_BIOME); + queue.setBiome(x, z, hybridPlotWorld.getPlotBiome()); } } } diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java index 8300fb21a..7986883a1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java @@ -621,7 +621,7 @@ public abstract class HybridUtils { finalZ + Z + plotWorld.ROAD_OFFSET_Z, biome); } else { queue.setBiome(finalX + X + plotWorld.ROAD_OFFSET_X, - finalZ + Z + plotWorld.ROAD_OFFSET_Z, plotWorld.PLOT_BIOME); + finalZ + Z + plotWorld.ROAD_OFFSET_Z, plotWorld.getPlotBiome()); } } }