Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-25 03:53:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugs bugs and more bugs

Browse Source
This commit is contained in:
Jesse Boyd 2014-10-12 01:15:00 -07:00
parent 3ffb182a3c
commit 0f7b5a4526
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java
View File

@ -131,15 +131,38 @@ public class PlotMeConverter {
new PlotId(Integer.parseInt(plot.id.split(";")[0]), Integer.parseInt(plot.id.split(";")[1]));
com.intellectualcrafters.plot.Plot pl = null;
if (online) {
pl =
new com.intellectualcrafters.plot.Plot(id, plot.getOwnerId(), plot.getBiome(), psAdded, psTrusted, psDenied, false, 8000l, false, "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] {
false, false, false, false });
pl = new com.intellectualcrafters.plot.Plot(
id,
plot.getOwnerId(),
plot.getBiome(),
psAdded, psTrusted,
psDenied,
false,
8000l,
false,
"",
PlotHomePosition.DEFAULT,
null,
world.getName(),
new boolean[] { false, false, false, false });
}
else {
String owner = plot.getOwner();
pl =
new com.intellectualcrafters.plot.Plot(id, UUID.nameUUIDFromBytes(("OfflinePlayer:" + owner).getBytes(Charsets.UTF_8)), plot.getBiome(), psAdded, psTrusted, psDenied, false, 8000l, false, "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] {
false, false, false, false });
pl = new com.intellectualcrafters.plot.Plot(
id,
UUID.nameUUIDFromBytes(("OfflinePlayer:" + owner).getBytes(Charsets.UTF_8)),
plot.getBiome(),
psAdded,
psTrusted,
psDenied,
false,
8000l,
false,
"",
PlotHomePosition.DEFAULT,
null,
world.getName(),
new boolean[] { false, false, false, false });
}
// TODO createPlot doesn't add helpers /

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

@ -359,10 +359,11 @@ public class DefaultPlotManager extends PlotManager {
@Override
public boolean setFloor(Player player, PlotWorld plotworld, PlotId plotid, PlotBlock[] blocks) {
DefaultPlotWorld dpw = (DefaultPlotWorld) plotworld;
World world = player.getWorld();
final Location pos1 = PlotHelper.getPlotBottomLoc(world, plotid).add(1, 0, 1);
final Location pos2 = PlotHelper.getPlotTopLoc(world, plotid);
PlotHelper.setCuboid(world, pos1, pos2, blocks);
PlotHelper.setCuboid(world, new Location(world,pos1.getX(),dpw.PLOT_HEIGHT,pos1.getZ()), new Location(world,pos2.getX()+1,dpw.PLOT_HEIGHT+1,pos2.getZ()+1), blocks);
return true;
}