Bukkit Superperms support

6 files changed, 249 insertions, 5 deletions

diff --git a/EssentialsGroupManager/.classpath b/EssentialsGroupManager/.classpath
new file mode 100644
index 000000000..eafae0c2b
--- /dev/null
+++ b/EssentialsGroupManager/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+	<classpathentry kind="lib" path="../lib/bukkit-0.0.1-SNAPSHOT.jar"/>

+	<classpathentry kind="lib" path="../lib/craftbukkit-0.0.1-SNAPSHOT.jar"/>

+</classpath>

diff --git a/EssentialsGroupManager/.project b/EssentialsGroupManager/.project
new file mode 100644
index 000000000..6ad74b347
--- /dev/null
+++ b/EssentialsGroupManager/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>EssentialsGroupManager</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 7f6e0fb85..2e094558c 100755..100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -5,6 +5,7 @@
 package org.anjocaido.groupmanager;
 
 import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler;
+import org.anjocaido.groupmanager.permissions.BukkitPermissions;
 import org.anjocaido.groupmanager.utils.GroupManagerPermissions;
 import org.anjocaido.groupmanager.data.Variables;
 import org.anjocaido.groupmanager.data.User;
@@ -45,15 +46,19 @@ public class GroupManager extends JavaPlugin {
     private ScheduledThreadPoolExecutor scheduler;
     private Map<String, ArrayList<User>> overloadedUsers = new HashMap<String, ArrayList<User>>();
     private Map<CommandSender, String> selectedWorlds = new HashMap<CommandSender, String>();
-    private WorldsHolder worldsHolder;
+    private static WorldsHolder worldsHolder;
     private boolean validateOnlinePlayer = true;
     private boolean isReady = false;
+    public static boolean isLoaded = false;
     private GMConfiguration config;
     private GMLoggerHandler ch;
+    public static BukkitPermissions BukkitPermissions;
     public static final Logger logger = Logger.getLogger(GroupManager.class.getName());
 
     @Override
     public void onDisable() {
+    	isLoaded = false;
+    	
         if (worldsHolder != null) {
             worldsHolder.saveChanges();
         }
@@ -82,8 +87,11 @@ public class GroupManager extends JavaPlugin {
             this.getServer().getPluginManager().disablePlugin(this);
             throw new IllegalStateException("An error ocurred while loading GroupManager");
         }
+        
+        BukkitPermissions = new BukkitPermissions(this);
 
         enableScheduler();
+        isLoaded = true;
         System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
     }
 
@@ -110,7 +118,7 @@ public class GroupManager extends JavaPlugin {
 
                 @Override
                 public void run() {
-                    GroupManager.this.worldsHolder.saveChanges();
+                    GroupManager.worldsHolder.saveChanges();
                 }
             };
             scheduler = new ScheduledThreadPoolExecutor(1);
@@ -153,7 +161,7 @@ public class GroupManager extends JavaPlugin {
         worldsHolder.reloadAll();
     }
 
-    public WorldsHolder getWorldsHolder() {
+    public static WorldsHolder getWorldsHolder() {
         return worldsHolder;
     }
 
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
index 4af5449fc..7523831e7 100755..100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
@@ -4,6 +4,7 @@
  */
 package org.anjocaido.groupmanager.data;
 
+import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.util.ArrayList;
 import java.util.Map;
@@ -52,7 +53,7 @@ public class Group extends DataUnit implements Cloneable {
     /**
      * Use this to deliver a group from a different dataSource to another
      * @param dataSource
-     * @return
+     * @return Null or Clone
      */
     public Group clone(WorldDataHolder dataSource) {
         if (dataSource.groupExists(this.getName())) {
@@ -79,7 +80,7 @@ public class Group extends DataUnit implements Cloneable {
     }
 
     /**
-     * @param inherits the inherits to set
+     * @param inherit the inherits to set
      */
     public void addInherits(Group inherit) {
         if (!this.getDataSource().groupExists(inherit.getName())) {
@@ -89,6 +90,8 @@ public class Group extends DataUnit implements Cloneable {
             inherits.add(inherit.getName().toLowerCase());
         }
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
     public boolean removeInherits(String inherit) {
@@ -118,5 +121,7 @@ public class Group extends DataUnit implements Cloneable {
             variables.addVar(key, temp.getVarObject(key));
         }
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
index b90cf4ff1..f3ea1d0f5 100755..100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
@@ -6,6 +6,8 @@ package org.anjocaido.groupmanager.data;
 
 //import com.sun.org.apache.bcel.internal.generic.AALOAD;
 import java.util.ArrayList;
+
+import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.util.Map;
 
@@ -102,6 +104,8 @@ public class User extends DataUnit implements Cloneable {
     public void setGroup(String group) {
         this.group = group;
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
     /**
@@ -114,6 +118,8 @@ public class User extends DataUnit implements Cloneable {
         group = getDataSource().getGroup(group.getName());
         this.group = group.getName();
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
     public void addSubGroup(Group subGroup) {
@@ -127,6 +133,8 @@ public class User extends DataUnit implements Cloneable {
         removeSubGroup(subGroup);
         subGroups.add(subGroup.getName());
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
     public int subGroupsSize() {
@@ -145,6 +153,8 @@ public class User extends DataUnit implements Cloneable {
         try {
             if (subGroups.remove(subGroup.getName())) {
                 flagAsChanged();
+                if (GroupManager.isLoaded)
+                	GroupManager.BukkitPermissions.updateAllPlayers();
                 return true;
             }
         } catch (Exception e) {
@@ -187,5 +197,7 @@ public class User extends DataUnit implements Cloneable {
             variables.addVar(key, temp.getVarObject(key));
         }
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
new file mode 100644
index 000000000..e396118b4
--- /dev/null
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -0,0 +1,195 @@
+/*

+* This program is free software; you can redistribute it and/or

+* modify it under the terms of the GNU General Public License

+* as published by the Free Software Foundation; either version 2

+* of the License, or (at your option) any later version.

+*

+* This program is distributed in the hope that it will be useful,

+* but WITHOUT ANY WARRANTY; without even the implied warranty of

+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+* GNU General Public License for more details.

+*

+* You should have received a copy of the GNU General Public License

+* along with this program; if not, write to the Free Software

+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+*/

+

+package org.anjocaido.groupmanager.permissions;

+

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Map;

+import java.util.Set;

+

+import org.anjocaido.groupmanager.GroupManager;

+import org.anjocaido.groupmanager.data.User;

+

+import org.bukkit.Bukkit;

+import org.bukkit.entity.Player;

+import org.bukkit.event.Event;

+import org.bukkit.event.player.PlayerJoinEvent;

+import org.bukkit.event.player.PlayerKickEvent;

+import org.bukkit.event.player.PlayerListener;

+import org.bukkit.event.player.PlayerPortalEvent;

+import org.bukkit.event.player.PlayerQuitEvent;

+import org.bukkit.event.player.PlayerRespawnEvent;

+import org.bukkit.event.player.PlayerTeleportEvent;

+import org.bukkit.event.server.PluginDisableEvent;

+import org.bukkit.event.server.PluginEnableEvent;

+import org.bukkit.event.server.ServerListener;

+import org.bukkit.permissions.Permission;

+import org.bukkit.permissions.PermissionAttachment;

+import org.bukkit.plugin.Plugin;

+import org.bukkit.plugin.PluginManager;

+

+

+/**

+ *

+ * BukkitPermissions overrides to force GM reponses to Superperms

+ *

+ * @author ElgarL, based upon PermissionsEX implementation

+ */

+public class BukkitPermissions {

+

+    protected Map<Player, PermissionAttachment> attachments = new HashMap<Player, PermissionAttachment>();

+    protected Set<Permission> registeredPermissions = new HashSet<Permission>();

+    protected Plugin plugin;

+    protected boolean dumpAllPermissions = true;

+    protected boolean dumpMatchedPermissions = true;

+

+    public BukkitPermissions(Plugin plugin) {

+        this.plugin = plugin;

+

+        this.collectPermissions();

+        this.registerEvents();

+

+        this.updateAllPlayers();

+

+        GroupManager.logger.info("Superperms support enabled.");

+    }

+

+    private void registerEvents() {

+        PluginManager manager = plugin.getServer().getPluginManager();

+

+        PlayerEvents playerEventListener = new PlayerEvents();

+

+        manager.registerEvent(Event.Type.PLAYER_JOIN, playerEventListener, Event.Priority.Normal, plugin);

+        manager.registerEvent(Event.Type.PLAYER_KICK, playerEventListener, Event.Priority.Normal, plugin);

+        manager.registerEvent(Event.Type.PLAYER_QUIT, playerEventListener, Event.Priority.Normal, plugin);

+

+        manager.registerEvent(Event.Type.PLAYER_RESPAWN, playerEventListener, Event.Priority.Normal, plugin);

+        manager.registerEvent(Event.Type.PLAYER_TELEPORT, playerEventListener, Event.Priority.Normal, plugin);

+        manager.registerEvent(Event.Type.PLAYER_PORTAL, playerEventListener, Event.Priority.Normal, plugin);

+

+        ServerListener serverListener = new BukkitEvents();

+

+        manager.registerEvent(Event.Type.PLUGIN_ENABLE, serverListener, Event.Priority.Normal, plugin);

+        manager.registerEvent(Event.Type.PLUGIN_DISABLE, serverListener, Event.Priority.Normal, plugin);

+    }

+

+    private void collectPermissions() {

+        registeredPermissions.clear();

+        for (Plugin bukkitPlugin : Bukkit.getServer().getPluginManager().getPlugins()) {

+            registeredPermissions.addAll(bukkitPlugin.getDescription().getPermissions());

+        }

+    }

+    

+    public void updatePermissions(Player player){

+        this.updatePermissions(player, null);

+    }

+    

+    public void updatePermissions(Player player, String world) {

+        if (player == null || !this.plugin.isEnabled()) {

+            return;

+        }

+

+        if (!this.attachments.containsKey(player)) {

+            this.attachments.put(player, player.addAttachment(plugin));

+        }

+

+        if(world == null){

+            world = player.getWorld().getName();

+        }

+        

+        PermissionAttachment attachment = this.attachments.get(player);

+

+        User user =  GroupManager.getWorldsHolder().getWorldData(world).getUser(player.getName());

+

+        // clear permissions

+        for (String permission : attachment.getPermissions().keySet()) {

+            attachment.unsetPermission(permission);

+        }

+

+        for (Permission permission : registeredPermissions) {

+            boolean permissionValue = user.getGroup().hasSamePermissionNode(permission.getName());

+

+            //GroupManager.logger.info(permission.getName() + " : " + Boolean.toString(permissionValue));

+

+            attachment.setPermission(permission, permissionValue);

+        }    

+

+        player.recalculatePermissions();

+

+    }

+

+    public void updateAllPlayers() {

+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {

+            updatePermissions(player);

+        }

+    }

+

+    protected class PlayerEvents extends PlayerListener {

+

+        @Override

+        public void onPlayerJoin(PlayerJoinEvent event) {

+            updatePermissions(event.getPlayer());

+        }

+

+        @Override

+        public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world

+            if(event.getPlayer().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed

+                return;

+            }

+            

+            updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());

+        }

+

+        @Override

+        public void onPlayerRespawn(PlayerRespawnEvent event) { // can be respawned in another world

+            updatePermissions(event.getPlayer(), event.getRespawnLocation().getWorld().getName());

+        }

+

+        @Override

+        public void onPlayerTeleport(PlayerTeleportEvent event) { // can be teleported into another world

+            if (!event.getFrom().getWorld().equals(event.getTo().getWorld())) { // only if world actually changed

+                updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());

+            }

+        }

+

+        @Override

+        public void onPlayerQuit(PlayerQuitEvent event) {

+            attachments.remove(event.getPlayer());

+        }

+

+        @Override

+        public void onPlayerKick(PlayerKickEvent event) {

+            attachments.remove(event.getPlayer());

+        }

+    }

+

+    protected class BukkitEvents extends ServerListener {

+

+        @Override

+        public void onPluginEnable(PluginEnableEvent event) {

+            collectPermissions();

+            updateAllPlayers();

+        }

+

+        @Override

+        public void onPluginDisable(PluginDisableEvent event) {

+            collectPermissions();

+            updateAllPlayers();

+        }

+    }

+

+}
\ No newline at end of file