From ce2de462b0635c9bee2e2f19e8136e2389e6b18d Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Fri, 24 Oct 2014 00:24:31 +1100
Subject: [PATCH] chat color support in flags

---
 .../com/intellectualcrafters/plot/Flag.java   |  2 +-
 .../plot/database/DBFunc.java                 | 19 -------------------
 .../plot/listeners/PlayerEvents.java          |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Flag.java b/PlotSquared/src/com/intellectualcrafters/plot/Flag.java
index b153d0387..0e038a13b 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/Flag.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/Flag.java
@@ -21,7 +21,7 @@ public class Flag {
 	 *             if you provide inadequate inputs
 	 */
 	public Flag(AbstractFlag key, String value) {
-		if (!StringUtils.isAlphanumericSpace(ChatColor.stripColor(value))) {
+		if (!StringUtils.isAlphanumericSpace(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', value)))) {
 			throw new IllegalArgumentException("Flag must be alphanumerical");
 		}
 		if (value.length() > 48) {
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java b/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
index 478d7676e..9e06bd96e 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
@@ -8,33 +8,14 @@
 
 package com.intellectualcrafters.plot.database;
 
-import static com.intellectualcrafters.plot.PlotMain.connection;
-
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.block.Biome;
-
-import sun.security.pkcs11.Secmod.DbMode;
-
 import com.intellectualcrafters.plot.Flag;
-import com.intellectualcrafters.plot.FlagManager;
-import com.intellectualcrafters.plot.Logger;
-import com.intellectualcrafters.plot.Logger.LogLevel;
 import com.intellectualcrafters.plot.Plot;
-import com.intellectualcrafters.plot.PlotHomePosition;
 import com.intellectualcrafters.plot.PlotId;
-import com.intellectualcrafters.plot.PlotMain;
 
 /**
  * @author Citymonstret
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
index 8bbcf8ce2..d68f210a0 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
@@ -451,7 +451,6 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
 		if (event.getEntity() instanceof Player) {
 			return;
 		}
-		System.out.print(event.getEntityType().getName());
 		if (!isInPlot(event.getLocation())) {
 			event.setCancelled(true);
 		}