diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index dcbddd75d..40cbb2b3a 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -8,7 +8,6 @@
UTF-8
PlotSquared
- 2.11.18
PlotSquared
jar
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
index 19747a873..eb37e83b4 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
@@ -353,7 +353,6 @@ public class SQLManager implements AbstractDB {
if (subList.size() != last || (count % 5000 == 0 && count > 0)) {
preparedStmt.executeBatch();
preparedStmt.close();
-
statement = mod.getCreateMySQL(subList.size());
preparedStmt = this.connection.prepareStatement(statement.toString());
}
@@ -377,7 +376,6 @@ public class SQLManager implements AbstractDB {
PlotSquared.log("&cERROR 1: " + " | " + objList.get(0).getClass().getCanonicalName());
}
}
-
try {
int count = 0;
PreparedStatement preparedStmt = null;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java
index 88167032c..17bee357f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java
@@ -241,6 +241,10 @@ public class LikePlotMeConverter {
@Override
public void run() {
sendMessage("&aDatabase conversion is now complete!");
+ PlotSquared.log("&c - Stop the server");
+ PlotSquared.log("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
+ PlotSquared.log("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
+ PlotSquared.log("&c - Start the server");
PlotSquared.setAllPlotsRaw(DBFunc.getPlots());
}
});
@@ -300,11 +304,7 @@ public class LikePlotMeConverter {
} catch (final Exception e) {
e.printStackTrace();
}
- sendMessage("&cPlease wait until database conversion is complete. You will be notified when this happens");
- PlotSquared.log("&c - Stop the server");
- PlotSquared.log("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
- PlotSquared.log("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
- PlotSquared.log("&c - Start the server");
+ sendMessage("&cPlease wait until database conversion is complete. You will be notified with instructions when this happens!");
}
});
} catch (final Exception e) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
index b2e9a4250..90f21c237 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
@@ -151,13 +151,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
}
}
}
-
- this.ROAD_SCHEMATIC_ENABLED = true;
-
if ((schem1 == null) || (schem2 == null) || (this.ROAD_WIDTH == 0)) {
PlotSquared.log(C.PREFIX.s() + "&3 - schematic: &7false");
return;
}
+ this.ROAD_SCHEMATIC_ENABLED = true;
// Do not populate road if using schematic population
this.ROAD_BLOCK = new PlotBlock(this.ROAD_BLOCK.id, (byte) 0);
final DataCollection[] blocks1 = schem1.getBlockCollection();
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
index 4b9cadc63..1091a4ef1 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
@@ -11,5 +11,4 @@ public abstract class EconHandler {
public abstract void depositMoney(PlotPlayer player, double amount);
public abstract void depositMoney(OfflinePlotPlayer player, double amount);
public abstract void setPermission(PlotPlayer player, String perm, boolean value);
- public abstract boolean getPermission(PlotPlayer player, String perm);
}
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
index 82da9abd7..b50d62738 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java
@@ -97,6 +97,7 @@ public class BukkitChunkManager extends ChunkManager {
@Override
public void regenerateChunk(String world, ChunkLoc loc) {
World worldObj = Bukkit.getWorld(world);
+// Chunk chunk = worldObj.getChunkAt(loc.x, loc.z);
worldObj.regenerateChunk(loc.x, loc.z);
for (final Player player : worldObj.getPlayers()) {
org.bukkit.Location locObj = player.getLocation();
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java
index 5c75e4592..17d48641f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java
@@ -73,9 +73,4 @@ public class BukkitEconHandler extends EconHandler {
perms.playerRemove(((BukkitPlayer) player).player, perm);
}
}
-
- @Override
- public boolean getPermission(PlotPlayer player, String perm) {
- return player.hasPermission(perm);
- }
}