EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Some fixes

Browse Source 
Fixes #641
Closes #640 (need to also update Plot2Dynmap)
Fixes #637 (duplicate)
Fixes #636
Fixes #634
This commit is contained in:
boy0001
2015-09-26 18:05:27 +10:00
parent d42ef3cf63
commit a93e8fac38
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/PS.java
View File

@@ -1277,7 +1277,7 @@ public class PS {
e.printStackTrace();
}
if (((plotWorld.TYPE == 2) && !Settings.ENABLE_CLUSTERS) || !(plotManager instanceof SquarePlotManager)) {
log("&c[ERROR] World '" + world + "' in settings.yml is not using PlotSquared generator! Please set the generator correctly or delete the world from the 'settings.yml'!");
log("&c[ERROR] World '" + world + "' in settings.yml is not using PlotSquared generator! Please set the generator correctly or delete the world from the 'settings.yml'! (https://github.com/IntellectualSites/PlotSquared/wiki/Manual-generator-setting)");
return;
}
log(C.PREFIX.s() + "&aDetected world load for '" + world + "'");

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

@@ -100,7 +100,7 @@ public class Merge extends SubCommand {
final int size = plot.getConnectedPlots().size();
final int maxSize = Permissions.hasPermissionRange(plr, "plots.merge", Settings.MAX_PLOTS);
if (size >= maxSize) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.merge." + size);
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.merge." + (size + 1));
return false;
}
if (args.length == 0) {

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

@@ -316,8 +316,8 @@ public abstract class HybridUtils {
final int tz = sz - 1;
final int ty = get_ey(world, bx, tx, bz, tz, by);
final Set<RegionWrapper> sideroad = new HashSet<>(Arrays.asList(new RegionWrapper(sx, ex, sz, ez)));
final Set<RegionWrapper> intersection = new HashSet<>(Arrays.asList(new RegionWrapper(bx, tx, bz, tz)));
final Set<RegionWrapper> sideroad = new HashSet<>(Arrays.asList(new RegionWrapper(sx, ex, sy, ey, sz, ez)));
final Set<RegionWrapper> intersection = new HashSet<>(Arrays.asList(new RegionWrapper(bx, tx, by, ty, bz, tz)));
final Location pos3 = new Location(world, bx, by, bz);
final Location pos4 = new Location(world, tx, ty, tz);

8
src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@@ -2127,7 +2127,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 0));
if (!tmp.getMerged(2)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(2, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}
@@ -2138,7 +2138,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 1));
if (!tmp.getMerged(3)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(3, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}
@@ -2149,7 +2149,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 2));
if (!tmp.getMerged(0)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(0, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}
@@ -2160,7 +2160,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 3));
if (!tmp.getMerged(1)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(1, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}