[trunk] Warp signs

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1095 e251c2fe-e539-e718-e476-b85c1f46cddb

2 files changed, 32 insertions, 36 deletions

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index d2e0cf3fa..286fd996c 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -119,22 +119,19 @@ public class EssentialsBlockListener extends BlockListener
 			}
                         if (event.getLine(0).equalsIgnoreCase("[Warp]"))
 			{
-				if (user.isAuthorized("essentials.signs.warp.create"))
-                                        if (event.getLine(1).isEmpty())
-                                        {
-                                            event.setLine(0, "§4[Warp]");
-                                            event.setLine(1, "§dWarp name here!");
-                                            return;
-                                        } else
-                                        {
-                                           event.setLine(0, "§1[Warp]");
-                                           return;
-                                        }
-                                        if (event.getLine(2).equalsIgnoreCase("Free"))
-                                            event.setLine(2, "§2Free");
-
-				else
-					event.setLine(0, "§4[Warp]");
+				event.setLine(0, "§4[Warp]");
+				if (user.isAuthorized("essentials.signs.warp.create")) {
+					if (event.getLine(1).isEmpty()) {
+						event.setLine(1, "§dWarp name here!");
+						return;
+					} else {
+						Essentials.getWarps().getWarp(event.getLine(1));
+						if (event.getLine(2).equalsIgnoreCase("Free")) {
+							event.setLine(2, "§2Free");
+						}
+						event.setLine(0, "§1[Warp]");						
+					}
+				}
 				return;
 			}
 		}
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index b8a82cd1a..a558f436a 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -339,30 +339,29 @@ public class EssentialsPlayerListener extends PlayerListener
 			}
 			if (sign.getLine(0).equals("§1[Balance]") && user.isAuthorized("essentials.signs.balance.use"))
 			{
-                                user.sendMessage("§7Balance: $" + user.getMoney());
+				user.sendMessage("§7Balance: $" + user.getMoney());
 				return;
 			}
                         if (sign.getLine(0).equals("§1[Warp]"))
 			{
-                            if (!sign.getLine(2).isEmpty())
-                            {
-                                if (sign.getLine(2).equals("§2Free"))
-                                {
-                                   user.teleportCooldown();
-                                   user.warpTo(sign.getLine(1));
-                                   return;
-                                }
-                                if (user.getGroup() == sign.getLine(2))
-                                {
-                                    user.teleportCooldown();
-                                    user.warpTo(sign.getLine(1));
-                                    return;
-                                }
-                            }
-                            if (user.isAuthorized("essentials.signs.warp.use"))
-                                        user.teleportCooldown();
-                                        user.warpTo(sign.getLine(1));
-                                        return;
+				if (!sign.getLine(2).isEmpty()) {
+					if (sign.getLine(2).equals("§2Free")) {
+						user.teleportCooldown();
+						user.warpTo(sign.getLine(1));
+						return;
+					}
+					if (user.getGroup().equalsIgnoreCase(sign.getLine(2))) {
+						user.teleportCooldown();
+						user.warpTo(sign.getLine(1));
+						return;
+					}
+				}
+				if (user.isAuthorized("essentials.signs.warp.use") && 
+					user.isAuthorized("essentials.warp." + sign.getLine(1))) {
+					user.teleportCooldown();
+					user.warpTo(sign.getLine(1));
+				}
+				return;
                         }
 		}
 		catch (Throwable ex)