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

Fix a few encapsulate merge issues

Browse Source
This commit is contained in:
dordsor21 2020-04-02 13:40:11 +01:00
parent 099a680c85
commit 7841ee3dcc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
View File

@ -468,8 +468,8 @@ import java.util.zip.ZipInputStream;
return; return;
} }
File file = new File( File file = new File(
this.IMP.getDirectory() + File.separator + "persistent_regen_data_" + plotArea.id + "_" this.IMP.getDirectory() + File.separator + "persistent_regen_data_" + plotArea.getId() + "_"
+ plotArea.worldname); + plotArea.getWorldName());
if (!file.exists()) { if (!file.exists()) {
return; return;
} }
@ -485,7 +485,7 @@ import java.util.zip.ZipInputStream;
int height = (int) list.get(2); int height = (int) list.get(2);
PlotSquared.log( PlotSquared.log(
Captions.PREFIX + "Incomplete road regeneration found. Restarting in world " 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(" Regions: " + regions.size());
PlotSquared.debug(" Chunks: " + chunks.size()); PlotSquared.debug(" Chunks: " + chunks.size());
HybridUtils.UPDATE = true; HybridUtils.UPDATE = true;
@ -496,7 +496,7 @@ import java.util.zip.ZipInputStream;
} finally { } finally {
if (!file.delete()) { if (!file.delete()) {
PlotSquared.log( 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."); + ". Please manually delete this file.");
} }
} }
@ -1563,7 +1563,7 @@ import java.util.zip.ZipInputStream;
list.add(chunks); list.add(chunks);
list.add(HybridUtils.height); list.add(HybridUtils.height);
File file = new File(this.IMP.getDirectory() + File.separator + "persistent_regen_data_" 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()) { if (file.exists() && !file.delete()) {
PlotSquared.log(Captions.PREFIX PlotSquared.log(Captions.PREFIX
+ "persistent_regen_data file already exists and could not be deleted."); + "persistent_regen_data file already exists and could not be deleted.");

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
View File

@ -124,7 +124,7 @@ public class HybridPlotManager extends ClassicPlotManager {
if (biome != null) { if (biome != null) {
queue.setBiome(x, z, biome); queue.setBiome(x, z, biome);
} else { } else {
queue.setBiome(x, z, hybridPlotWorld.PLOT_BIOME); queue.setBiome(x, z, hybridPlotWorld.getPlotBiome());
} }
} }
} }

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
View File

@ -621,7 +621,7 @@ public abstract class HybridUtils {
finalZ + Z + plotWorld.ROAD_OFFSET_Z, biome); finalZ + Z + plotWorld.ROAD_OFFSET_Z, biome);
} else { } else {
queue.setBiome(finalX + X + plotWorld.ROAD_OFFSET_X, 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());
} }
} }
} }