Merge remote-tracking branch 'origin/master'

PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java

@@ -9,7 +9,9 @@
 package com.intellectualcrafters.plot;
 
 import com.intellectualcrafters.plot.database.DBFunc;
+
 import net.milkbowl.vault.economy.Economy;
+
 import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
@@ -17,6 +19,7 @@ import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -202,17 +205,18 @@ public class PlotHelper {
 		long r = ((nextLong() >>> 32) * n) >> 32;
 		return (int) r;
 	}
+	/*
+     * End of random number gen section
+     */
 
 	public static void removeSign(Player plr, Plot p) {
 		World world = plr.getWorld();
 		PlotManager manager = PlotMain.getPlotManager(world);
 		PlotWorld plotworld = PlotMain.getWorldSettings(world);
 		Location loc = manager.getSignLoc(plr, plotworld, p);
-		loc.getBlock().setType(Material.AIR);
+		Block bs = loc.getBlock();
+		bs.setType(Material.AIR);
 	}
-	/*
-	 * End of random number gen section
-	 */
 
 	@SuppressWarnings("deprecation")
 	public static void setSign(Player plr, Plot p) {
@@ -673,7 +677,6 @@ public class PlotHelper {
 		manager.clearPlot(requester, plot);
 
 		removeSign(requester, plot);
-		setSign(requester, plot);
 
 		PlayerFunctions.sendMessage(requester, C.CLEARING_DONE.s().replaceAll("%time%", ""
 				+ ((System.nanoTime() - start) / 1000000.0)));

PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java

@@ -9,6 +9,7 @@
 package com.intellectualcrafters.plot;
 
 import ca.mera.CameraAPI;
+
 import com.intellectualcrafters.plot.Logger.LogLevel;
 import com.intellectualcrafters.plot.Settings.Web;
 import com.intellectualcrafters.plot.commands.Camera;
@@ -29,8 +30,10 @@ import com.intellectualcrafters.plot.uuid.PlotUUIDSaver;
 import com.intellectualcrafters.plot.uuid.UUIDSaver;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
 import me.confuser.barapi.BarAPI;
 import net.milkbowl.vault.economy.Economy;
+
 import org.bukkit.*;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Entity;
@@ -426,6 +429,9 @@ public class PlotMain extends JavaPlugin {
 				public void run() {
 					for (String world : getPlotWorldsString()) {
 						if (plots.containsKey(world)) {
+						    
+						    ArrayList<Plot> toDeletePlot = new ArrayList<Plot>();
+						    
 							for (Plot plot : plots.get(world).values()) {
 								if (plot.owner == null) {
 									continue;
@@ -442,13 +448,16 @@ public class PlotMain extends JavaPlugin {
 										event.setCancelled(true);
 									}
 									else {
+									    toDeletePlot.add(plot);
+									}
+								}
+							}
+							for (Plot plot: toDeletePlot) {
 							    DBFunc.delete(world, plot);
 							}
 						}
 					}
 				}
-					}
-				}
 			});
 		}
 		else {

PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java

@@ -112,11 +112,11 @@ public abstract class PlotWorld {
 		this.SELL_PRICE = config.getDouble("economy.prices.sell");
 		this.PLOT_CHAT = config.getBoolean("chat.enabled");
 		this.DEFAULT_FLAGS = config.getStringList("flags.default");
-		this.PVP = config.getBoolean("events.pvp");
+		this.PVP = config.getBoolean("event.pvp");
-        this.PVE = config.getBoolean("events.pve");
+        this.PVE = config.getBoolean("event.pve");
-        this.SPAWN_EGGS = config.getBoolean("events.spawn.egg");
+        this.SPAWN_EGGS = config.getBoolean("event.spawn.egg");
-        this.SPAWN_CUSTOM = config.getBoolean("events.spawn.custom");
+        this.SPAWN_CUSTOM = config.getBoolean("event.spawn.custom");
-        this.SPAWN_BREEDING = config.getBoolean("events.spawn.breeding");
+        this.SPAWN_BREEDING = config.getBoolean("event.spawn.breeding");
         loadConfiguration(config);
 	}
 
@@ -143,11 +143,11 @@ public abstract class PlotWorld {
 		options.put("economy.prices.sell", PlotWorld.SELL_PRICE_DEFAULT);
 		options.put("chat.enabled", PlotWorld.PLOT_CHAT_DEFAULT);
 		options.put("flags.default", PlotWorld.DEFAULT_FLAGS_DEFAULT);
-        options.put("events.pvp", PlotWorld.PVP_DEFAULT);
+        options.put("event.pvp", PlotWorld.PVP_DEFAULT);
-        options.put("events.pve", PlotWorld.PVE_DEFAULT);
+        options.put("event.pve", PlotWorld.PVE_DEFAULT);
-        options.put("events.spawn.egg", PlotWorld.SPAWN_EGGS_DEFAULT);
+        options.put("event.spawn.egg", PlotWorld.SPAWN_EGGS_DEFAULT);
         options.put("event.spawn.custom", PlotWorld.SPAWN_CUSTOM_DEFAULT);
-        options.put("events.spawn.breeding", PlotWorld.SPAWN_BREEDING_DEFAULT);
+        options.put("event.spawn.breeding", PlotWorld.SPAWN_BREEDING_DEFAULT);
 		ConfigurationNode[] settings = getSettingNodes();
 
 		/*

PlotSquared/src/com/intellectualcrafters/plot/commands/Copy.java

@@ -18,7 +18,7 @@ import org.bukkit.entity.Player;
 public class Copy extends SubCommand {
 
 	public Copy() {
-		super(Command.COPY, "Copy a plot", "clear", CommandCategory.ACTIONS, true);
+		super(Command.COPY, "Copy a plot", "copy", CommandCategory.ACTIONS, true);
 	}
 
 	@Override

PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java

@@ -56,7 +56,6 @@ public class Delete extends SubCommand {
 		}
 		boolean result = PlotMain.removePlot(plr.getWorld().getName(), plot.id, true);
 		if (result) {
-			PlotHelper.removeSign(plr, plot);
 			plot.clear(plr);
 			DBFunc.delete(plr.getWorld().getName(), plot);
 		}

PlotSquared/src/com/intellectualcrafters/plot/commands/Kick.java

@@ -40,7 +40,7 @@ public class Kick extends SubCommand {
 			PlayerFunctions.sendMessage(plr, "&c/plot kick <player>");
 			return false;
 		}
-		if (Bukkit.getPlayer(args[0]) != null) {
+		if (Bukkit.getPlayer(args[0]) == null) {
 			PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER.s().replaceAll("%player%", args[0]));
 			return false;
 		}

PlotSquared/src/com/intellectualcrafters/plot/commands/Purge.java

@@ -22,7 +22,7 @@ import com.intellectualcrafters.plot.database.DBFunc;
 public class Purge extends SubCommand {
 
 	public Purge() {
-		super("purge", "plots.admin", "Purge all plots for a world", "", "purge", CommandCategory.ACTIONS, false);
+		super("purge", "plots.admin", "Purge all plots for a world", "purge", "", CommandCategory.ACTIONS, false);
 	}
 
 	@Override

PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java

@@ -99,7 +99,7 @@ public class Set extends SubCommand {
 				PlayerFunctions.sendMessage(plr, C.NOT_VALID_FLAG);
 				return false;
 			}
-			if (!plr.hasPermission("plots.set.flag" + args[1].toLowerCase())) {
+			if (!plr.hasPermission("plots.set.flag." + args[1].toLowerCase())) {
 				PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
 				return false;
 			}

PlotSquared/src/com/intellectualcrafters/plot/commands/Setup.java

@@ -54,7 +54,7 @@ public class Setup extends SubCommand implements Listener {
 	}
 
 	public Setup() {
-		super("setup", "plots.admin", "Setup a PlotWorld", "setup {world}", "setup", CommandCategory.ACTIONS, false);
+		super("setup", "plots.admin", "Setup a PlotWorld", "setup {world} {generator}", "setup", CommandCategory.ACTIONS, false);
 	}
 
 	@Override

PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java

@@ -252,23 +252,23 @@ public class DefaultPlotManager extends PlotManager {
 		for (int i = startX; i < chunkX; i += 16) {
 			for (int j = startZ; j < chunkZ; j += 16) {
 				Plot plot1 = PlotHelper.getCurrentPlot(new Location(world, i, 0, j));
-				if ((plot1 != null) && (plot1.getId() != plot.getId()) && plot1.hasOwner()) {
+				if ((plot1 != null) && (plot1.getId() != plot.getId())) {
 					break;
 				}
 				Plot plot2 = PlotHelper.getCurrentPlot(new Location(world, i + 15, 0, j));
-				if ((plot2 != null) && (plot2.getId() != plot.getId()) && plot2.hasOwner()) {
+				if ((plot2 != null) && (plot2.getId() != plot.getId())) {
 					break;
 				}
 				Plot plot3 = PlotHelper.getCurrentPlot(new Location(world, i + 15, 0, j + 15));
-				if ((plot3 != null) && (plot3.getId() != plot.getId()) && plot3.hasOwner()) {
+				if ((plot3 != null) && (plot3.getId() != plot.getId())) {
 					break;
 				}
 				Plot plot4 = PlotHelper.getCurrentPlot(new Location(world, i, 0, j + 15));
-				if ((plot4 != null) && (plot4.getId() != plot.getId()) && plot4.hasOwner()) {
+				if ((plot4 != null) && (plot4.getId() != plot.getId())) {
 					break;
 				}
 				Plot plot5 = PlotHelper.getCurrentPlot(new Location(world, i + 15, 0, j + 15));
-				if ((plot5 != null) && (plot5.getId() != plot.getId()) && plot5.hasOwner()) {
+				if ((plot5 != null) && (plot5.getId() != plot.getId())) {
 					break;
 				}
 				if (min == null) {

PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java

@@ -119,6 +119,7 @@ public class WorldGuardListener implements Listener {
 	@EventHandler(
 			priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onUnlink(PlotUnlinkEvent event) {
+	    try {
     		World w = event.getWorld();
     		ArrayList<PlotId> plots = event.getPlots();
     		Plot main = PlotMain.getPlots(w).get(plots.get(0));
@@ -149,9 +150,14 @@ public class WorldGuardListener implements Listener {
     			manager.addRegion(rg);
     		}
 	    }
+	    catch (Exception e) {
+	        
+	    }
+	}
 
 	@EventHandler
 	public void onPlotClaim(PlayerClaimPlotEvent event) {
+	    try {
     		Player player = event.getPlayer();
     		Plot plot = event.getPlot();
     		RegionManager manager = PlotMain.worldGuard.getRegionManager(plot.getWorld());
@@ -172,13 +178,22 @@ public class WorldGuardListener implements Listener {
     
     		manager.addRegion(region);
 	    }
+	    catch (Exception e) {
+	        
+	    }
+	}
 
 	@EventHandler
 	public void onPlotDelete(PlotDeleteEvent event) {
+	    try {
     		PlotId plot = event.getPlotId();
     		World world = Bukkit.getWorld(event.getWorld());
     
     		RegionManager manager = PlotMain.worldGuard.getRegionManager(world);
     		manager.removeRegion(plot.x + "-" + plot.y);
 	    }
+	    catch (Exception e) {
+	        
+	    }
+	}
 }

PlotSquared/src/plugin.yml

@@ -1,6 +1,6 @@
 name: PlotSquared
 main: com.intellectualcrafters.plot.PlotMain
-version: 2.0.5
+version: 2.1
 load: STARTUP
 description: >
              Easy, yet powerful Plot World generation and management.