Merge 069180abcd into 649efc25bb

src/main/java/com/wimbli/WorldBorder/Config.java

@@ -54,6 +54,7 @@ public class Config
 	private static boolean denyEnderpearl = false;
 	private static int fillAutosaveFrequency = 30;
 	private static int fillMemoryTolerance = 500;
+	private static boolean preventBlockPlace = false;
 
 	// for monitoring plugin efficiency
 //	public static long timeUsed = 0;
@@ -259,6 +260,18 @@ public class Config
 		world.playEffect(loc, Effect.SMOKE, 4);
 		world.playEffect(loc, Effect.GHAST_SHOOT, 0);
 	}
+	
+	public static void setPreventBlockPlace(boolean enable)
+	{
+		preventBlockPlace = enable;
+		log("prevent block place " + (enable ? "enabled" : "disabled") + ".");
+		save(true);
+	}
+	
+	public static boolean preventBlockPlace()
+	{
+		return preventBlockPlace;
+	}
 
 	public static boolean getIfPlayerKill()
 	{
@@ -566,6 +579,7 @@ public class Config
 		fillAutosaveFrequency = cfg.getInt("fill-autosave-frequency", 30);
 		importBypassStringList(cfg.getStringList("bypass-list-uuids"));
 		fillMemoryTolerance = cfg.getInt("fill-memory-tolerance", 500);
+		preventBlockPlace = cfg.getBoolean("prevent-block-place");
 
 		StartBorderTimer();
 
@@ -672,6 +686,7 @@ public class Config
 		cfg.set("fill-autosave-frequency", fillAutosaveFrequency);
 		cfg.set("bypass-list-uuids", exportBypassStringList());
 		cfg.set("fill-memory-tolerance", fillMemoryTolerance);
+		cfg.set("prevent-block-place", preventBlockPlace);
 
 		cfg.set("worlds", null);
 		for(Entry<String, BorderData> stringBorderDataEntry : borders.entrySet())

src/main/java/com/wimbli/WorldBorder/WBCommand.java

@@ -42,6 +42,7 @@ public class WBCommand implements CommandExecutor
 		addCmd(new CmdKnockback());		// 1
 		addCmd(new CmdWrap());			// 1
 		addCmd(new CmdWhoosh());		// 1
+		addCmd(new CmdPreventPlace());	// 1
 		addCmd(new CmdGetmsg());		// 1
 		addCmd(new CmdSetmsg());		// 1
 		addCmd(new CmdWshape());		// 3

src/main/java/com/wimbli/WorldBorder/WBListener.java

@@ -1,9 +1,11 @@
 package com.wimbli.WorldBorder;
 
 import org.bukkit.Chunk;
+import org.bukkit.World;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
@@ -69,4 +71,22 @@ public class WBListener implements Listener
 		Config.logWarn("Border-checking task was not running! Something on your server apparently killed it. It will now be restarted.");
 		Config.StartBorderTimer();
 	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onBlockPlace(BlockPlaceEvent event)
+	{
+		if (!Config.preventBlockPlace()) return;
+
+		Location loc = event.getBlockPlaced().getLocation();
+		if (loc == null) return;
+	
+		World world = loc.getWorld();
+		if (world == null) return;
+		BorderData border = Config.Border(world.getName());
+		if (border == null) return;
+		
+		if (!border.insideBorder(loc.getX(), loc.getZ(), Config.ShapeRound())) {
+			event.setCancelled(true);
+		}
+	}
 }

src/main/java/com/wimbli/WorldBorder/cmd/CmdPreventPlace.java

@@ -0,0 +1,37 @@
+package com.wimbli.WorldBorder.cmd;
+
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.wimbli.WorldBorder.Config;
+
+public class CmdPreventPlace extends WBCmd {
+
+	public CmdPreventPlace() {
+		name = permission = "preventblockplace";
+		minParams = maxParams = 1;
+
+		addCmdExample(nameEmphasized() + "<on|off> - turn prevent-block-place on or off.");
+		helpText = "Default value: off. This will prevent players from placing blocks outside the world's border.";
+	}
+	
+	@Override
+	public void cmdStatus(CommandSender sender)
+	{
+		sender.sendMessage(C_HEAD + "preventblockplace is " + enabledColored(Config.whooshEffect()) + C_HEAD + ".");
+	}
+
+	@Override
+	public void execute(CommandSender sender, Player player, List<String> params, String worldName)
+	{
+		Config.setPreventBlockPlace(strAsBool(params.get(0)));
+
+		if (player != null)
+		{
+			Config.log((Config.preventBlockPlace() ? "Enabled" : "Disabled") + " preventblockplace at the command of player \"" + player.getName() + "\".");
+			cmdStatus(sender);
+		}
+	}
+}