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

fixed sqlite somehow...

Browse Source 
and plot merging
This commit is contained in:
Jesse Boyd 2014-10-12 12:44:59 -07:00
parent 9b6d3e2b14
commit 05c1ed139c
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -343,7 +343,7 @@ public class PlotHelper {
Plot p = new Plot(plot.id, player.getUniqueId(), plot.settings.getBiome(), new ArrayList<UUID>(), new ArrayList<UUID>(), w.getName()); Plot p = new Plot(plot.id, player.getUniqueId(), plot.settings.getBiome(), new ArrayList<UUID>(), new ArrayList<UUID>(), w.getName());
PlotMain.updatePlot(p); PlotMain.updatePlot(p);
DBFunc.createPlot(p); DBFunc.createPlot(p);
DBFunc.createPlotSettings(DBFunc.getId(w.getName(), p.id), p); DBFunc.createPlotSettings(DBFunc.getId(w.getName(), plot.id), plot);
PlotWorld plotworld = PlotMain.getWorldSettings(w); PlotWorld plotworld = PlotMain.getWorldSettings(w);
if (plotworld.AUTO_MERGE) { if (plotworld.AUTO_MERGE) {
autoMerge(w, p, player); autoMerge(w, p, player);
@ -750,14 +750,14 @@ public class PlotHelper {
int x = bot.getBlockX() + (top.getBlockX() - bot.getBlockX()); int x = bot.getBlockX() + (top.getBlockX() - bot.getBlockX());
int z = bot.getBlockZ() - 2; int z = bot.getBlockZ() - 2;
int y = w.getHighestBlockYAt(x, z); int y = w.getHighestBlockYAt(x, z);
return new Location(w, x, y + 2, z); return new Location(w, x, y, z);
} }
else { else {
int x = top.getBlockX() - bot.getBlockX(); int x = top.getBlockX() - bot.getBlockX();
int z = top.getBlockZ() - bot.getBlockZ(); int z = top.getBlockZ() - bot.getBlockZ();
int y = w.getHighestBlockYAt(x, z); int y = w.getHighestBlockYAt(x, z);
return new Location(w, bot.getBlockX() + x/2, y + 2, bot.getBlockZ() + z/2); return new Location(w, bot.getBlockX() + x/2, y, bot.getBlockZ() + z/2);
} }
} }

15
PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java
View File

@ -17,6 +17,7 @@ import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.C; import com.intellectualcrafters.plot.C;
import com.intellectualcrafters.plot.PlayerFunctions; import com.intellectualcrafters.plot.PlayerFunctions;
import com.intellectualcrafters.plot.Plot; import com.intellectualcrafters.plot.Plot;
import com.intellectualcrafters.plot.PlotHelper;
import com.intellectualcrafters.plot.PlotId; import com.intellectualcrafters.plot.PlotId;
import com.intellectualcrafters.plot.PlotMain; import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.PlotManager; import com.intellectualcrafters.plot.PlotManager;
@ -84,26 +85,26 @@ public class Unlink extends SubCommand {
boolean lx = x < pos2.x; boolean lx = x < pos2.x;
boolean ly = y < pos2.y; boolean ly = y < pos2.y;
new PlotId(x, y); Plot p = PlotHelper.getPlot(world, new PlotId(x, y));
if (lx) { if (lx) {
manager.createRoadEast(plotworld, plot); manager.createRoadEast(plotworld, p);
if (ly) { if (ly) {
manager.createRoadSouthEast(plotworld, plot); manager.createRoadSouthEast(plotworld, p);
} }
} }
if (ly) { if (ly) {
manager.createRoadSouth(plotworld, plot); manager.createRoadSouth(plotworld, p);
} }
} }
} }
try { try {
SetBlockFast.update(plr); if (PlotHelper.canSetFast) {
SetBlockFast.update(plr);
}
} }
catch (Exception e) { catch (Exception e) {

5
PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
View File

@ -251,7 +251,7 @@ public class DBFunc {
} }
else { else {
stmt.addBatch("CREATE TABLE IF NOT EXISTS `plot` (" + "`id` INTEGER(11) PRIMARY KEY," stmt.addBatch("CREATE TABLE IF NOT EXISTS `plot` (" + "`id` INTEGER PRIMARY KEY AUTOINCREMENT,"
+ "`plot_id_x` INT(11) NOT NULL," + "`plot_id_z` INT(11) NOT NULL," + "`plot_id_x` INT(11) NOT NULL," + "`plot_id_z` INT(11) NOT NULL,"
+ "`owner` VARCHAR(45) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`owner` VARCHAR(45) NOT NULL," + "`world` VARCHAR(45) NOT NULL,"
+ "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)"); + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
@ -340,8 +340,7 @@ public class DBFunc {
public static int getId(String world, PlotId id2) { public static int getId(String world, PlotId id2) {
PreparedStatement stmt = null; PreparedStatement stmt = null;
try { try {
stmt = stmt = connection.prepareStatement("SELECT `id` FROM `plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC");
connection.prepareStatement("SELECT `id` FROM `plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC");
stmt.setInt(1, id2.x); stmt.setInt(1, id2.x);
stmt.setInt(2, id2.y); stmt.setInt(2, id2.y);
stmt.setString(3, world); stmt.setString(3, world);

16
PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java
View File

@ -448,8 +448,8 @@ public class DefaultPlotManager extends PlotManager {
Location pos1 = getPlotBottomLocAbs(plotworld, plot.id); Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
Location pos2 = getPlotTopLocAbs(plotworld, plot.id); Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
int sx = pos2.getBlockX(); int sx = pos2.getBlockX() + 1;
int ex = (sx + dpw.ROAD_WIDTH); int ex = (sx + dpw.ROAD_WIDTH) - 1;
int sz = pos1.getBlockZ() - 1; int sz = pos1.getBlockZ() - 1;
int ez = pos2.getBlockZ() + 2; int ez = pos2.getBlockZ() + 2;
@ -474,8 +474,8 @@ public class DefaultPlotManager extends PlotManager {
Location pos1 = getPlotBottomLocAbs(plotworld, plot.id); Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
Location pos2 = getPlotTopLocAbs(plotworld, plot.id); Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
int sz = pos2.getBlockZ(); int sz = pos2.getBlockZ() + 1;
int ez = (sz + dpw.ROAD_WIDTH); int ez = (sz + dpw.ROAD_WIDTH) - 1;
int sx = pos1.getBlockX() - 1; int sx = pos1.getBlockX() - 1;
int ex = pos2.getBlockX() + 2; int ex = pos2.getBlockX() + 2;
@ -518,8 +518,8 @@ public class DefaultPlotManager extends PlotManager {
Location pos1 = getPlotBottomLocAbs(plotworld, plot.id); Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
Location pos2 = getPlotTopLocAbs(plotworld, plot.id); Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
int sx = pos2.getBlockX(); int sx = pos2.getBlockX() + 1;
int ex = (sx + dpw.ROAD_WIDTH); int ex = (sx + dpw.ROAD_WIDTH) - 1;
int sz = pos1.getBlockZ(); int sz = pos1.getBlockZ();
int ez = pos2.getBlockZ() + 1; int ez = pos2.getBlockZ() + 1;
@ -538,8 +538,8 @@ public class DefaultPlotManager extends PlotManager {
Location pos1 = getPlotBottomLocAbs(plotworld, plot.id); Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
Location pos2 = getPlotTopLocAbs(plotworld, plot.id); Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
int sz = pos2.getBlockZ(); int sz = pos2.getBlockZ() + 1;
int ez = (sz + dpw.ROAD_WIDTH); int ez = (sz + dpw.ROAD_WIDTH) - 1;
int sx = pos1.getBlockX(); int sx = pos1.getBlockX();
int ex = pos2.getBlockX() + 1; int ex = pos2.getBlockX() + 1;