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

Async schematic pasting

Browse Source 
- We should replace the schematic on claim with this.
- worldedit listener now listens to plot deletion
- debugclaimtest command no longer pastes any schematics if there is on
set
This commit is contained in:
boy0001 2014-10-30 17:24:58 +11:00
parent 0aaf573186
commit 5395852cf0
9 changed files with 305 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java
View File

@ -207,7 +207,7 @@ public enum C {
* Info * Info
*/ */
PLOT_INFO_UNCLAIMED("&cPlot &6%s&c is not yet claimed"), PLOT_INFO_UNCLAIMED("&cPlot &6%s&c is not yet claimed"),
PLOT_INFO("&6ID&7: &a%id%&7\n&6Alias&7: &a%alias%\n&6Owner&7: &a%owner%\n&6Description&7: &a%desc%\n&6Rating&7: &a%rating%&7/&a10\n&6Can build&7: &a%build%"), PLOT_INFO("&6ID&7: &a%id%&7\n&6Alias&7: &a%alias%\n&6Owner&7: &a%owner%\n&6Helpers&7: &a%helpers%\n&6Trusted&7: &a%trusted%\n&Denied&7: &a%denied%\n&6Denied&7: &a%denied%\n&6Flags&7: &a%flags%\n&6Biome&7: &a%biome%\n&6Rating&7: &a%rating%&7/&a10\n&6Can build&7: &a%build%"),
PLOT_INFO_HELPERS("&6Helpers&7: %helpers%"), PLOT_INFO_HELPERS("&6Helpers&7: %helpers%"),
PLOT_INFO_TRUSTED("&6Trusted&7: %trusted%"), PLOT_INFO_TRUSTED("&6Trusted&7: %trusted%"),

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java
View File

@ -80,6 +80,24 @@ public class PWE {
return s.getMask() == null; return s.getMask() == null;
} }
public static void setNoMask(Player p) {
try {
LocalSession s;
if (PlotMain.worldEdit == null) {
s = WorldEdit.getInstance().getSession(p.getName());
}
else {
s = PlotMain.worldEdit.getSession(p);
}
BukkitPlayer plr = PlotMain.worldEdit.wrapPlayer(p);
Vector p1 = new Vector(69, 69, 69), p2 = new Vector(69, 69, 69);
s.setMask(new RegionMask(new CuboidRegion(plr.getWorld(), p1, p2)));
}
catch (Exception e) {
}
}
public static void removeMask(Player p, LocalSession s) { public static void removeMask(Player p, LocalSession s) {
Mask mask = null; Mask mask = null;
s.setMask(mask); s.setMask(mask);

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -266,18 +266,19 @@ public class PlotHelper {
* @param block * @param block
* @param plotblock * @param plotblock
*/ */
public static void setBlock(Block block, PlotBlock plotblock) { public static boolean setBlock(Block block, PlotBlock plotblock) {
if (canSetFast) { if (canSetFast) {
if (block.getTypeId() != plotblock.id && plotblock.data != block.getData()) { if (block.getTypeId() != plotblock.id || plotblock.data != block.getData()) {
try { try {
SetBlockFast.set(block.getWorld(), block.getX(), block.getY(), block.getZ(), plotblock.id, plotblock.data); SetBlockFast.set(block.getWorld(), block.getX(), block.getY(), block.getZ(), plotblock.id, plotblock.data);
return; return true;
} }
catch (NoSuchMethodException e) { catch (NoSuchMethodException e) {
canSetFast = false; canSetFast = false;
} }
} }
return false;
} }
if (block.getData() == plotblock.data) { if (block.getData() == plotblock.data) {
if (block.getTypeId() != plotblock.id) { if (block.getTypeId() != plotblock.id) {
@ -292,6 +293,7 @@ public class PlotHelper {
block.setTypeIdAndData(plotblock.id, plotblock.data, false); block.setTypeIdAndData(plotblock.id, plotblock.data, false);
} }
} }
return false;
} }
/** /**

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
View File

@ -115,10 +115,9 @@ public class PlotMain extends JavaPlugin {
return new WorldGenerator(worldname); return new WorldGenerator(worldname);
} }
@SuppressWarnings("deprecation")
public static void checkForExpiredPlots() { public static void checkForExpiredPlots() {
final JavaPlugin plugin = PlotMain.getMain(); final JavaPlugin plugin = PlotMain.getMain();
Bukkit.getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() { Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
checkExpired(plugin, true); checkExpired(plugin, true);
@ -1217,7 +1216,7 @@ public class PlotMain extends JavaPlugin {
options.put("mysql.user", "root"); options.put("mysql.user", "root");
options.put("mysql.password", "password"); options.put("mysql.password", "password");
options.put("mysql.database", "plot_db"); options.put("mysql.database", "plot_db");
options.put("prefix", "plotsquared_"); options.put("prefix", "");
for (Entry<String, Object> node : options.entrySet()) { for (Entry<String, Object> node : options.entrySet()) {
if (!storage.contains(node.getKey())) { if (!storage.contains(node.getKey())) {
storage.set(node.getKey(), node.getValue()); storage.set(node.getKey(), node.getValue());

43
PlotSquared/src/main/java/com/intellectualcrafters/plot/SchematicHandler.java
View File

@ -7,6 +7,7 @@ import org.bukkit.block.Block;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.intellectualcrafters.jnbt.*; import com.intellectualcrafters.jnbt.*;
import com.intellectualcrafters.plot.SchematicHandler.DataCollection;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -27,7 +28,6 @@ import java.util.zip.GZIPOutputStream;
*/ */
@SuppressWarnings({"all"}) @SuppressWarnings({"all"})
public class SchematicHandler { public class SchematicHandler {
/** /**
* Paste a schematic * Paste a schematic
* @param location origin * @param location origin
@ -35,13 +35,12 @@ public class SchematicHandler {
* @param plot plot to paste in * @param plot plot to paste in
* @return true if succeeded * @return true if succeeded
*/ */
public static boolean paste(Location location, Schematic schematic, Plot plot) { public static boolean paste(Location location, Schematic schematic, Plot plot, int x_offset, int z_offset) {
if (schematic == null) { if (schematic == null) {
PlotMain.sendConsoleSenderMessage("Schematic == null :|"); PlotMain.sendConsoleSenderMessage("Schematic == null :|");
return false; return false;
} }
try { try {
Dimension demensions = schematic.getSchematicDimension(); Dimension demensions = schematic.getSchematicDimension();
int WIDTH = demensions.getX(); int WIDTH = demensions.getX();
@ -68,7 +67,7 @@ public class SchematicHandler {
short id = blocks[index].getBlock(); short id = blocks[index].getBlock();
byte data = blocks[index].getData(); byte data = blocks[index].getData();
Block block = world.getBlockAt(l1.getBlockX()+x, l1.getBlockY()+y, l1.getBlockZ()+z); Block block = world.getBlockAt(l1.getBlockX()+x+x_offset, l1.getBlockY()+y, l1.getBlockZ()+z+z_offset);
PlotBlock plotblock = new PlotBlock(id, data); PlotBlock plotblock = new PlotBlock(id, data);
@ -274,9 +273,9 @@ public class SchematicHandler {
PlotMain.sendConsoleSenderMessage("&7 - Cannot save: corrupt chunk at "+(i/16)+", "+(j/16)); PlotMain.sendConsoleSenderMessage("&7 - Cannot save: corrupt chunk at "+(i/16)+", "+(j/16));
return null; return null;
} }
int width = pos2.getBlockX()-pos1.getBlockX(); int width = pos2.getBlockX()-pos1.getBlockX()+1;
int height = 256; int height = 256;
int length = pos2.getBlockZ()-pos1.getBlockZ(); int length = pos2.getBlockZ()-pos1.getBlockZ()+1;
HashMap<String, Tag> schematic = new HashMap<>(); HashMap<String, Tag> schematic = new HashMap<>();
schematic.put("Width", new ShortTag("Width", (short) width)); schematic.put("Width", new ShortTag("Width", (short) width));
@ -354,4 +353,36 @@ public class SchematicHandler {
return this.data; return this.data;
} }
} }
public static boolean pastePart(World world, DataCollection[] blocks, Location l1, int x_offset, int z_offset, int i1, int i2, int WIDTH, int LENGTH) {
boolean result = false;
for (int i = i1; i<=i2 ;i++) {
short id = blocks[i].getBlock();
byte data = blocks[i].getData();
if (id==0) {
continue;
}
int area = WIDTH*LENGTH;
int r = i%(area);
int x = r%WIDTH;
int y = i/area;
int z = r/WIDTH;
if (y>256) {
break;
}
Block block = world.getBlockAt(l1.getBlockX()+x+x_offset, l1.getBlockY()+y, l1.getBlockZ()+z+z_offset);
PlotBlock plotblock = new PlotBlock(id, data);
boolean set = PlotHelper.setBlock(block, plotblock);
if (!result && set) {
result = true;
}
}
return result;
}
} }

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

@ -110,7 +110,7 @@ public class Claim extends SubCommand {
sch = SchematicHandler.getSchematic(world.SCHEMATIC_FILE); sch = SchematicHandler.getSchematic(world.SCHEMATIC_FILE);
} }
} }
SchematicHandler.paste(player.getLocation(), sch, plot); SchematicHandler.paste(player.getLocation(), sch, plot, 0, 0);
} }
if (world.DEFAULT_FLAGS != null && world.DEFAULT_FLAGS.size() > 0) { if (world.DEFAULT_FLAGS != null && world.DEFAULT_FLAGS.size() > 0) {
plot.settings.setFlags(FlagManager.parseFlags(PlotMain.getWorldSettings(player.getWorld()).DEFAULT_FLAGS)); plot.settings.setFlags(FlagManager.parseFlags(PlotMain.getWorldSettings(player.getWorld()).DEFAULT_FLAGS));

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

@ -175,21 +175,6 @@ public class DebugClaimTest extends SubCommand {
if (teleport) { if (teleport) {
PlotMain.teleportPlayer(player, player.getLocation(), plot); PlotMain.teleportPlayer(player, player.getLocation(), plot);
} }
PlotWorld world = PlotMain.getWorldSettings(plot.getWorld());
if (world.SCHEMATIC_ON_CLAIM) {
SchematicHandler handler = new SchematicHandler();
SchematicHandler.Schematic sch;
if (schematic.equals("")) {
sch = handler.getSchematic(world.SCHEMATIC_FILE);
}
else {
sch = handler.getSchematic(schematic);
if (sch == null) {
sch = handler.getSchematic(world.SCHEMATIC_FILE);
}
}
handler.paste(player.getLocation(), sch, plot);
}
plot.settings.setFlags(FlagManager.parseFlags(PlotMain.getWorldSettings(player.getWorld()).DEFAULT_FLAGS)); plot.settings.setFlags(FlagManager.parseFlags(PlotMain.getWorldSettings(player.getWorld()).DEFAULT_FLAGS));
} }
return event.isCancelled(); return event.isCancelled();

346
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java
View File

@ -2,7 +2,11 @@ package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.jnbt.CompoundTag; import com.intellectualcrafters.jnbt.CompoundTag;
import com.intellectualcrafters.plot.*; import com.intellectualcrafters.plot.*;
import com.intellectualcrafters.plot.SchematicHandler.DataCollection;
import com.intellectualcrafters.plot.SchematicHandler.Dimension;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -11,122 +15,186 @@ import java.util.HashMap;
public class Schematic extends SubCommand { public class Schematic extends SubCommand {
public Schematic() { public Schematic() {
super("schematic", "plots.admin", "Schematic Command", "schematic {arg}", "sch", CommandCategory.ACTIONS, false); super("schematic", "plots.admin", "Schematic Command", "schematic {arg}", "sch", CommandCategory.ACTIONS, false);
// TODO command to fetch schematic from worldedit directory // TODO command to fetch schematic from worldedit directory
} }
private int counter = 0; private int counter = 0;
private boolean running = false; private boolean running = false;
private Plot[] plots; private Plot[] plots;
private int task; private int task;
@Override
public boolean execute(final Player plr, String... args) {
@Override if (args.length < 1) {
public boolean execute(final Player plr, String... args) { sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
if (args.length < 1) { return true;
sendMessage(plr, C.SCHEMATIC_MISSING_ARG); }
return true; String arg = args[0].toLowerCase();
} final String file;
String arg = args[0].toLowerCase(); final SchematicHandler.Schematic schematic;
String file; switch (arg) {
SchematicHandler.Schematic schematic; case "paste":
switch (arg) { if (plr==null) {
case "paste":
if (plr==null) {
PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE); PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE);
return false; return false;
} }
if (!PlotMain.hasPermission(plr, "plots.schematic.save")) { if (!PlotMain.hasPermission(plr, "plots.schematic.paste")) {
PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.paste"); PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.paste");
return false; return false;
} }
if (args.length < 2) { if (args.length < 2) {
sendMessage(plr, C.SCHEMATIC_MISSING_ARG); sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
break; break;
} }
if (!PlayerFunctions.isInPlot(plr)) { if (!PlayerFunctions.isInPlot(plr)) {
sendMessage(plr, C.NOT_IN_PLOT); sendMessage(plr, C.NOT_IN_PLOT);
break; break;
} }
file = args[1]; if (running) {
schematic = SchematicHandler.getSchematic(file); PlayerFunctions.sendMessage(plr, "&cTask is already running.");
boolean s = SchematicHandler.paste(plr.getLocation(), schematic, PlayerFunctions.getCurrentPlot(plr)); return false;
if (s) { }
sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS); final String file2 = args[1];
} running = true;
else { this.counter = 0;
sendMessage(plr, C.SCHEMATIC_PASTE_FAILED); Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
} @Override
break; public void run() {
case "test": final SchematicHandler.Schematic schematic = SchematicHandler.getSchematic(file2);
if (plr==null) { if (schematic==null) {
sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent or not in gzip format");
running = false;
return;
}
final int x;
final int z;
final Plot plot2 = PlayerFunctions.getCurrentPlot(plr);
Dimension dem = schematic.getSchematicDimension();
Location bot = PlotHelper.getPlotBottomLoc(plr.getWorld(), plot2.id).add(1, 0, 1);
int length2 = PlotHelper.getPlotWidth(plr.getWorld(), plot2.id);
if ((dem.getX() > length2) || (dem.getZ() > length2)) {
sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", dem.getX(), dem.getZ(), length2));
running = false;
return;
}
if (dem.getX() != length2 || dem.getZ() != length2) {
Location loc = plr.getLocation();
x = Math.min(length2-dem.getX(),loc.getBlockX() - bot.getBlockX());
z = Math.min(length2-dem.getZ(),loc.getBlockZ() - bot.getBlockZ());
}
else {
x = 0;
z = 0;
}
final World w = plot2.getWorld();
final DataCollection[] b = schematic.getBlockCollection();
int sy = w.getHighestBlockYAt(bot.getBlockX(), bot.getBlockZ());
final Location l1 = bot.add(0, sy-1, 0);
final int WIDTH = schematic.getSchematicDimension().getX();
final int LENGTH = schematic.getSchematicDimension().getZ();
final int blen = b.length-1;
final Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
boolean result = false;
while (!result) {
int start = counter*5000;
if (start>blen) {
sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
if (PlotHelper.canSetFast) {
SetBlockFast.update(plr);
}
running = false;
Bukkit.getScheduler().cancelTask(task);
return;
}
int end = Math.min(start+5000,blen);
result = SchematicHandler.pastePart(w, b, l1, x, z, start, end, WIDTH, LENGTH);
counter++;
}
}
}, 1, 1);
}
});
break;
case "test":
if (plr==null) {
PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE); PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE);
return false; return false;
} }
if (!PlotMain.hasPermission(plr, "plots.schematic.save")) { if (!PlotMain.hasPermission(plr, "plots.schematic.test")) {
PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test"); PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
return false; return false;
} }
if (args.length < 2) { if (args.length < 2) {
sendMessage(plr, C.SCHEMATIC_MISSING_ARG); sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
break; break;
} }
file = args[1]; file = args[1];
schematic = SchematicHandler.getSchematic(file); schematic = SchematicHandler.getSchematic(file);
if (schematic == null) { if (schematic == null) {
sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent"); sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
break; break;
} }
int l1 = schematic.getSchematicDimension().getX(); int l1 = schematic.getSchematicDimension().getX();
int l2 = schematic.getSchematicDimension().getZ(); int l2 = schematic.getSchematicDimension().getZ();
Plot plot = PlayerFunctions.getCurrentPlot(plr); Plot plot = PlayerFunctions.getCurrentPlot(plr);
int length = PlotHelper.getPlotWidth(plr.getWorld(), plot.id); int length = PlotHelper.getPlotWidth(plr.getWorld(), plot.id);
if ((l1 != length) || (l2 != length)) { if ((l1 < length) || (l2 < length)) {
sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length)); sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
break; break;
} }
sendMessage(plr, C.SCHEMATIC_VALID); sendMessage(plr, C.SCHEMATIC_VALID);
break; break;
case "saveall": case "saveall":
case "exportall": case "exportall":
if (plr!=null) { if (plr!=null) {
PlayerFunctions.sendMessage(plr, C.NOT_CONSOLE); PlayerFunctions.sendMessage(plr, C.NOT_CONSOLE);
return false; return false;
} }
if (args.length!=2) { if (args.length!=2) {
PlayerFunctions.sendMessage(plr, "&cNeed world arg. Use &7/plots sch exportall <world>"); PlayerFunctions.sendMessage(plr, "&cNeed world arg. Use &7/plots sch exportall <world>");
return false; return false;
} }
HashMap<PlotId, Plot> plotmap = PlotMain.getPlots(args[1]); HashMap<PlotId, Plot> plotmap = PlotMain.getPlots(args[1]);
if (plotmap==null || plotmap.size()==0) { if (plotmap==null || plotmap.size()==0) {
PlayerFunctions.sendMessage(plr, "&cInvalid world. Use &7/plots sch exportall <world>"); PlayerFunctions.sendMessage(plr, "&cInvalid world. Use &7/plots sch exportall <world>");
return false; return false;
} }
if (running) { if (running) {
PlayerFunctions.sendMessage(plr, "&cTask is already running."); PlayerFunctions.sendMessage(plr, "&cTask is already running.");
return false; return false;
} }
PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while."); PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while.");
PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &7Found &c"+plotmap.size()+"&7 plots..."); PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &7Found &c"+plotmap.size()+"&7 plots...");
final World worldObj = Bukkit.getWorld(args[1]); final World worldObj = Bukkit.getWorld(args[1]);
final String worldname = Bukkit.getWorld(args[1]).getName(); final String worldname = Bukkit.getWorld(args[1]).getName();
final Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"); final Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
this.plots = plotmap.values().toArray(new Plot[0]); this.plots = plotmap.values().toArray(new Plot[0]);
this.running = true; this.running = true;
this.counter = 0; this.counter = 0;
task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() { task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
if (counter>=plots.length) { if (counter>=plots.length) {
@ -159,55 +227,55 @@ public class Schematic extends SubCommand {
} }
counter++; counter++;
} }
}, 20, 20); }, 20, 20);
break; break;
case "export": case "export":
case "save": case "save":
if (!PlotMain.hasPermission(plr, "plots.schematic.save")) { if (!PlotMain.hasPermission(plr, "plots.schematic.save")) {
PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save"); PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
return false; return false;
} }
if (running) { if (running) {
PlayerFunctions.sendMessage(plr, "&cTask is already running."); PlayerFunctions.sendMessage(plr, "&cTask is already running.");
return false; return false;
} }
final String world; final String world;
final Plot p2; final Plot p2;
if (plr!=null) { if (plr!=null) {
if(!PlayerFunctions.isInPlot(plr)) { if(!PlayerFunctions.isInPlot(plr)) {
sendMessage(plr, C.NOT_IN_PLOT); sendMessage(plr, C.NOT_IN_PLOT);
return false; return false;
} }
Plot myplot = PlayerFunctions.getCurrentPlot(plr); Plot myplot = PlayerFunctions.getCurrentPlot(plr);
if(!myplot.hasRights(plr)) { if(!myplot.hasRights(plr)) {
sendMessage(plr, C.NO_PLOT_PERMS); sendMessage(plr, C.NO_PLOT_PERMS);
return false; return false;
} }
p2 = myplot; p2 = myplot;
world = plr.getWorld().getName(); world = plr.getWorld().getName();
} }
else { else {
if (args.length==3) { if (args.length==3) {
try { try {
world = args[0]; world = args[0];
String[] split = args[2].split(";"); String[] split = args[2].split(";");
PlotId i = new PlotId(Integer.parseInt(split[0]),Integer.parseInt(split[1])); PlotId i = new PlotId(Integer.parseInt(split[0]),Integer.parseInt(split[1]));
if (PlotMain.getPlots(world)==null || PlotMain.getPlots(world).get(i) == null) { if (PlotMain.getPlots(world)==null || PlotMain.getPlots(world).get(i) == null) {
PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
return false; return false;
} }
p2 = PlotMain.getPlots(world).get(i); p2 = PlotMain.getPlots(world).get(i);
} }
catch (Exception e) { catch (Exception e) {
PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
return false; return false;
} }
} }
else { else {
PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>"); PlayerFunctions.sendMessage(plr, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
return false; return false;
} }
} }
final Plugin plugin2 = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"); final Plugin plugin2 = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
@ -250,11 +318,11 @@ public class Schematic extends SubCommand {
counter++; counter++;
} }
}, 20, 60); }, 20, 60);
break; break;
default: default:
sendMessage(plr, C.SCHEMATIC_MISSING_ARG); sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
break; break;
} }
return true; return true;
} }
} }

24
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
View File

@ -4,6 +4,7 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -25,6 +26,7 @@ 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.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.events.PlotDeleteEvent;
/** /**
* @author Citymonstret * @author Citymonstret
@ -38,6 +40,28 @@ public class WorldEditListener implements Listener {
return (PlotMain.isPlotWorld(l.getWorld())); return (PlotMain.isPlotWorld(l.getWorld()));
} }
@EventHandler(
priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onDelete(PlotDeleteEvent e) {
String world = e.getWorld();
PlotId id = e.getPlotId();
Plot plot = PlotMain.getPlots(world).get(id);
if (plot==null || plot.owner == null) {
return;
}
Player player = Bukkit.getPlayer(plot.owner);
if (player == null) {
return;
}
if (!world.equals(player.getWorld().getName())) {
return;
}
if (PlotMain.hasPermission(player, "plots.worldedit.bypass")) {
return;
}
PWE.setNoMask(player);
}
@EventHandler( @EventHandler(
priority = EventPriority.LOWEST, ignoreCancelled = true) priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onInteract(PlayerInteractEvent e) { public void onInteract(PlayerInteractEvent e) {