Merge branch 'refs/heads/master' into release

EssentialsGroupManager/src/Changelog.txt

@@ -109,3 +109,6 @@ v 1.9:
 	- Fixed text when adding a subgroup to not say the player was moved.
 	- Update to new Bukkit Event system.
 	- Update GroupManagerBridge for new event system.
+	- Fixed a random null error upon a player portaling.
+	- Fixed infinite loop error on player join.
+	- Optimized code to only update the player logging in instead of all players online.

EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java

@@ -26,7 +26,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
 import org.anjocaido.groupmanager.events.GMWorldListener;
-import org.anjocaido.groupmanager.events.GroupManagerEvent;
 import org.anjocaido.groupmanager.utils.GMLoggerHandler;
 import org.anjocaido.groupmanager.utils.PermissionCheckResult;
 import org.anjocaido.groupmanager.utils.Tasks;

EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java

@@ -114,7 +114,7 @@ public class User extends DataUnit implements Cloneable {
 		flagAsChanged();
 		if (GroupManager.isLoaded())
 			if (!GroupManager.BukkitPermissions.isPlayer_join())
-				GroupManager.BukkitPermissions.updateAllPlayers();
+				GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
 	}
 
 	/**
@@ -131,7 +131,7 @@ public class User extends DataUnit implements Cloneable {
 		flagAsChanged();
 		if (GroupManager.isLoaded()) {
 			if (!GroupManager.BukkitPermissions.isPlayer_join())
-				GroupManager.BukkitPermissions.updateAllPlayers();
+				GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
 
 			// Do we notify of the group change?
 			String defaultGroupName = getDataSource().getDefaultGroup().getName();
@@ -160,7 +160,7 @@ public class User extends DataUnit implements Cloneable {
 		flagAsChanged();
 		if (GroupManager.isLoaded()) {
 			if (!GroupManager.BukkitPermissions.isPlayer_join())
-				GroupManager.BukkitPermissions.updateAllPlayers();
+				GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
 			GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED);
 		}
 	}
@@ -183,7 +183,7 @@ public class User extends DataUnit implements Cloneable {
 				flagAsChanged();
 				if (GroupManager.isLoaded())
 					if (!GroupManager.BukkitPermissions.isPlayer_join())
-						GroupManager.BukkitPermissions.updateAllPlayers();
+						GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
 				GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED);
 				return true;
 			}
@@ -229,8 +229,8 @@ public class User extends DataUnit implements Cloneable {
 		}
 		flagAsChanged();
 		if (GroupManager.isLoaded()) {
-			if (!GroupManager.BukkitPermissions.isPlayer_join())
+			//if (!GroupManager.BukkitPermissions.isPlayer_join())
-				GroupManager.BukkitPermissions.updateAllPlayers();
+			//	GroupManager.BukkitPermissions.updatePlayer(this.getName());
 			GroupManagerEventHandler.callEvent(this, Action.USER_INFO_CHANGED);
 		}
 	}

EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java

@@ -1,6 +1,9 @@
 package org.anjocaido.groupmanager.events;
 
+import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.data.Group;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 
@@ -8,7 +11,7 @@ import org.bukkit.event.HandlerList;
  * @author ElgarL
  *
  */
-public class GMGroupEvent extends GroupManagerEvent {
+public class GMGroupEvent extends Event {
 
     /**
 	 * 
@@ -67,4 +70,16 @@ public class GMGroupEvent extends GroupManagerEvent {
         GROUP_ADDED,
         GROUP_REMOVED,
     }
+    
+    public void schedule(final GMGroupEvent event) {
+
+		if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {
+
+			@Override
+			public void run() {
+				Bukkit.getServer().getPluginManager().callEvent(event);
+			}
+		}, 1) == -1)
+			GroupManager.logger.warning("Could not schedule GM Event.");
+    }
 }

EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java

@@ -1,5 +1,8 @@
 package org.anjocaido.groupmanager.events;
 
+import org.anjocaido.groupmanager.GroupManager;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 
@@ -7,7 +10,7 @@ import org.bukkit.event.HandlerList;
  * @author ElgarL
  *
  */
-public class GMSystemEvent extends GroupManagerEvent {
+public class GMSystemEvent extends Event {
 
     /**
 	 * 
@@ -44,4 +47,16 @@ public class GMSystemEvent extends GroupManagerEvent {
         DEFAULT_GROUP_CHANGED,
         VALIDATE_TOGGLE,
     }
+    
+    public void schedule(final GMSystemEvent event) {
+
+		if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {
+
+			@Override
+			public void run() {
+				Bukkit.getServer().getPluginManager().callEvent(event);
+			}
+		}, 1) == -1)
+			GroupManager.logger.warning("Could not schedule GM Event.");
+    }
 }

EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java

@@ -1,6 +1,9 @@
 package org.anjocaido.groupmanager.events;
 
+import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.data.User;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 
@@ -8,7 +11,7 @@ import org.bukkit.event.HandlerList;
  * @author ElgarL
  *
  */
-public class GMUserEvent extends GroupManagerEvent {
+public class GMUserEvent extends Event {
 
     /**
 	 * 
@@ -69,4 +72,16 @@ public class GMUserEvent extends GroupManagerEvent {
         USER_ADDED,
         USER_REMOVED,
     }
+    
+    public void schedule(final GMUserEvent event) {
+
+		if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {
+
+			@Override
+			public void run() {
+				Bukkit.getServer().getPluginManager().callEvent(event);
+			}
+		}, 1) == -1)
+			GroupManager.logger.warning("Could not schedule GM Event.");
+    }
 }

EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEvent.java

@@ -1,42 +0,0 @@
-package org.anjocaido.groupmanager.events;
-
-
-import org.anjocaido.groupmanager.GroupManager;
-import org.bukkit.Bukkit;
-import org.bukkit.event.Event;
-
-/**
- * @author ElgarL
- *
- */
-public abstract class GroupManagerEvent extends Event {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8790362185329926951L;
-	
-	protected GroupManagerEvent(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Triggers all GroupManager events for other plugins to see.
-	 * Schedules events for 1 tick later to allow GM to finish populating super perms.
-	 * 
-	 * @param event
-	 */
-	public void schedule(final GroupManagerEvent event) {
-
-			if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {
-
-				@Override
-				public void run() {
-					Bukkit.getServer().getPluginManager().callEvent(event);
-				}
-			}, 1) == -1)
-				GroupManager.logger.warning("Could not schedule GM Event.");
-	}
-	
-	
-}

EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java

@@ -7,6 +7,8 @@ import org.anjocaido.groupmanager.data.User;
 /**
  * @author ElgarL
  * 
+ * Handles all Event generation.
+ *
  */
 public class GroupManagerEventHandler {
 	

EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java

@@ -123,7 +123,6 @@ public class BukkitPermissions {
 		
 	}
 
-
 	public void updatePermissions(Player player) {
 		this.updatePermissions(player, null);
 	}
@@ -362,6 +361,14 @@ public class BukkitPermissions {
 		}
 	}
 	
+	/**
+	 * force Bukkit to update this Players permissions.
+	 */
+	public void updatePlayer(Player player) {
+		if (player != null)
+			this.updatePermissions(player, null);
+	}
+
 	protected class PlayerEvents implements Listener {
 
 		@EventHandler(priority = EventPriority.LOWEST)
@@ -370,7 +377,7 @@ public class BukkitPermissions {
 			Player player = event.getPlayer();
 			// force GM to create the player if they are not already listed.
 			if (plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {
-				//setPlayer_join(false);
+				setPlayer_join(false);
 				updatePermissions(event.getPlayer());
 			}
 			setPlayer_join(false);
@@ -378,7 +385,7 @@ public class BukkitPermissions {
 
 		@EventHandler(priority = EventPriority.LOWEST)
 		public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
-			if (event.getTo() != null && !event.getFrom().getWorld().equals(event.getTo().getWorld())) { // only if world actually changed
+			if ((event.getTo() != null) && (!event.getFrom().getWorld().equals(event.getTo().getWorld()))) { // only if world actually changed
 				updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
 			}
 		}
@@ -390,7 +397,7 @@ public class BukkitPermissions {
 
 		@EventHandler(priority = EventPriority.LOWEST)
 		public void onPlayerTeleport(PlayerTeleportEvent event) { // can be teleported into another world
-			if (event.getTo() != null && !event.getFrom().getWorld().equals(event.getTo().getWorld())) { // only if world actually changed
+			if ((event.getTo() != null) && (!event.getFrom().getWorld().equals(event.getTo().getWorld()))) { // only if world actually changed
 				updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
 			}
 		}

EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java

@@ -51,7 +51,8 @@ public class EssentialsProtectBlockListener implements Listener
 			return;
 		}
 
-		if (prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
+		if (!user.hasPermission("essentials.protect.alerts.notrigger") 
+			&& prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
 		{
 			prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
 		}
@@ -249,7 +250,8 @@ public class EssentialsProtectBlockListener implements Listener
 		}
 		final Material type = block.getType();
 
-		if (prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId))
+		if (!user.hasPermission("essentials.protect.alerts.notrigger") 
+			&& prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId))
 		{
 			prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke"));
 		}

EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java

@@ -83,6 +83,7 @@ public class EssentialsProtectPlayerListener implements Listener
 			}
 		}
 		if (item != null
+			&& !user.hasPermission("essentials.protect.alerts.notrigger")
 			&& prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId()))
 		{
 			prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed"));