From 2864d0186c0a086a530e571110638137eed03597 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Sun, 23 Sep 2012 23:01:14 +0100
Subject: [PATCH] Move wildcard perm check to superperms handler, rather than
 being PEX specific.

---
 .../com/earth2me/essentials/perm/PermissionsExHandler.java    | 2 +-
 .../src/com/earth2me/essentials/perm/SuperpermsHandler.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
index 565342e98..68dc3fe50 100644
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
@@ -66,7 +66,7 @@ public class PermissionsExHandler extends SuperpermsHandler
 	@Override
 	public boolean hasPermission(final Player base, final String node)
 	{
-		return base.hasPermission("*") || super.hasPermission(base, node);
+		return super.hasPermission(base, node);
 	}
 
 	@Override
diff --git a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java b/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java
index aedd4c5ae..5dbe9eb93 100644
--- a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java
@@ -33,6 +33,10 @@ public class SuperpermsHandler implements IPermissionsHandler
 	@Override
 	public boolean hasPermission(final Player base, final String node)
 	{
+		if (base.hasPermission("*"))
+		{
+			return true;
+		}
 		if (base.hasPermission("-" + node))
 		{
 			return false;