Added Event System

src/com/massivecraft/factions/Board.java

@@ -9,11 +9,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 
 import com.google.gson.reflect.TypeToken;
+import com.massivecraft.factions.event.LandUnclaimEvent;
 import com.massivecraft.factions.integration.LWCFeatures;
 import com.massivecraft.factions.iface.RelationParticipator;
 import com.massivecraft.factions.util.AsciiCompass;
@@ -82,10 +84,15 @@ public class Board
 			Entry<FLocation, String> entry = iter.next();
 			if (entry.getValue().equals(factionId))
 			{
-				if(Conf.onUnclaimResetLwcLocks && LWCFeatures.getEnabled())
-					LWCFeatures.clearAllChests(entry.getKey());
+				LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(entry.getKey(), entry.getValue());
+				Bukkit.getServer().getPluginManager().callEvent(unclaimEvent);	
+				if(!unclaimEvent.isCancelled())
+				{	
+					if(Conf.onUnclaimResetLwcLocks && LWCFeatures.getEnabled())
+						LWCFeatures.clearAllChests(entry.getKey());
 
-				iter.remove();
+					iter.remove();
+				}
 			}
 		}
 	}

src/com/massivecraft/factions/FPlayer.java

@@ -3,10 +3,13 @@ package com.massivecraft.factions;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
+import com.massivecraft.factions.event.FPlayerLeaveEvent;
+import com.massivecraft.factions.event.LandClaimEvent;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.iface.RelationParticipator;
 import com.massivecraft.factions.integration.Econ;
@@ -507,7 +510,11 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 			double cost = Conf.econCostLeave;
 			if ( ! Econ.modifyMoney(this, -cost, "to leave your faction.", "for leaving your faction.")) return;
 		}
-
+		
+		FPlayerLeaveEvent leaveEvent = new FPlayerLeaveEvent(this,myFaction,FPlayerLeaveEvent.PlayerLeaveReason.LEAVE);
+		Bukkit.getServer().getPluginManager().callEvent(leaveEvent);
+		if (leaveEvent.isCancelled()) return;
+		
 		// Am I the last one in the faction?
 		if (myFaction.getFPlayers().size() == 1)
 		{
@@ -656,7 +663,11 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 
 			}
 		}
-
+		
+		LandClaimEvent claimEvent = new LandClaimEvent(flocation, forFaction.getId(), this.getId());
+		Bukkit.getServer().getPluginManager().callEvent(claimEvent);
+		if(claimEvent.isCancelled()) return false;
+		
 		if (LWCFeatures.getEnabled() && forFaction.isNormal() && Conf.onCaptureResetLwcLocks)
 			LWCFeatures.clearOtherChests(flocation, this.getFaction());
 

src/com/massivecraft/factions/cmd/CmdCreate.java

@@ -2,12 +2,16 @@ package com.massivecraft.factions.cmd;
 
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
+
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.P;
+import com.massivecraft.factions.event.FPlayerJoinEvent;
+import com.massivecraft.factions.event.FactionCreateEvent;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Rel;
 
@@ -54,6 +58,11 @@ public class CmdCreate extends FCommand
 			return;
 		}
 		
+		FactionCreateEvent createEvent = new FactionCreateEvent(tag, me);
+		Bukkit.getServer().getPluginManager().callEvent(createEvent);
+
+		if(createEvent.isCancelled()) return;
+		
 		// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
 		if ( ! payForCommand(Conf.econCostCreate, "to create a new faction", "for creating a new faction")) return;
 
@@ -66,6 +75,9 @@ public class CmdCreate extends FCommand
 			return;
 		}
 
+		FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.CREATE);
+		Bukkit.getServer().getPluginManager().callEvent(joinEvent); 
+		
 		faction.setTag(tag);
 		fme.setRole(Rel.LEADER);
 		fme.setFaction(faction);

src/com/massivecraft/factions/cmd/CmdDisband.java

@@ -1,6 +1,10 @@
 package com.massivecraft.factions.cmd;
 
+import org.bukkit.Bukkit;
+
 import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.event.FPlayerLeaveEvent;
+import com.massivecraft.factions.event.FactionDisbandEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
@@ -45,12 +49,17 @@ public class CmdDisband extends FCommand
 			return;
 		}
 
+		FactionDisbandEvent disbandEvent = new FactionDisbandEvent(me, faction.getId());
+		Bukkit.getServer().getPluginManager().callEvent(disbandEvent);
+		if(disbandEvent.isCancelled()) return;
+		
 		// Inform all players
 		for (FPlayer fplayer : FPlayers.i.getOnline())
 		{
 			String who = senderIsConsole ? "A server admin" : fme.describeTo(fplayer);
 			if (fplayer.getFaction() == faction)
 			{
+				Bukkit.getServer().getPluginManager().callEvent(new FPlayerLeaveEvent(fplayer,faction, FPlayerLeaveEvent.PlayerLeaveReason.DISBAND));
 				fplayer.msg("<h>%s<i> disbanded your faction.", who);
 			}
 			else

src/com/massivecraft/factions/cmd/CmdJoin.java

@@ -1,10 +1,16 @@
 package com.massivecraft.factions.cmd;
 
+import org.bukkit.Bukkit;
+
 import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.P;
+import com.massivecraft.factions.event.FPlayerJoinEvent;
+import com.massivecraft.factions.event.FPlayerLeaveEvent;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.persist.EM;
 
 public class CmdJoin extends FCommand
 {
@@ -76,6 +82,18 @@ public class CmdJoin extends FCommand
 		if (samePlayer && ! payForCommand(Conf.econCostJoin, "to join a faction", "for joining a faction")) return;
 
 		fme.msg("<i>%s successfully joined %s.", fplayer.describeTo(fme, true), faction.getTag(fme));
+		
+		if(!EM.detached(myFaction))
+		{
+			FPlayerLeaveEvent leaveEvent = new FPlayerLeaveEvent(FPlayers.i.get(me),faction,FPlayerLeaveEvent.PlayerLeaveReason.JOINOTHER);
+			Bukkit.getServer().getPluginManager().callEvent(leaveEvent);
+			if (leaveEvent.isCancelled()) return;
+		}
+		
+		FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.COMMAND);
+		Bukkit.getServer().getPluginManager().callEvent(joinEvent);
+		if (joinEvent.isCancelled()) return;
+		
 		if (!samePlayer)
 			fplayer.msg("<i>%s moved you into the faction %s.", fme.describeTo(fplayer, true), faction.getTag(fplayer));
 		faction.msg("<i>%s joined your faction.", fplayer.describeTo(faction, true));

src/com/massivecraft/factions/cmd/CmdKick.java

@@ -1,9 +1,12 @@
 package com.massivecraft.factions.cmd;
 
+import org.bukkit.Bukkit;
+
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.P;
+import com.massivecraft.factions.event.FPlayerLeaveEvent;
 import com.massivecraft.factions.struct.FPerm;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Rel;
@@ -60,6 +63,10 @@ public class CmdKick extends FCommand
 		// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
 		if ( ! payForCommand(Conf.econCostKick, "to kick someone from the faction", "for kicking someone from the faction")) return;
 
+		FPlayerLeaveEvent event = new FPlayerLeaveEvent(you, you.getFaction(), FPlayerLeaveEvent.PlayerLeaveReason.KICKED);
+		Bukkit.getServer().getPluginManager().callEvent(event);
+		if (event.isCancelled()) return;
+		
 		yourFaction.msg("%s<i> kicked %s<i> from the faction! :O", fme.describeTo(yourFaction, true), you.describeTo(yourFaction, true));
 		you.msg("%s<i> kicked you from %s<i>! :O", fme.describeTo(you, true), yourFaction.describeTo(you));
 		if (yourFaction != myFaction)

src/com/massivecraft/factions/cmd/CmdLeader.java

@@ -1,8 +1,11 @@
 package com.massivecraft.factions.cmd;
 
+import org.bukkit.Bukkit;
+
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Rel;
 import com.massivecraft.factions.util.RelationUtil;
@@ -64,6 +67,10 @@ public class CmdLeader extends FCommand
 			}
 		}
 		
+		FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.i.get(me),targetFaction,FPlayerJoinEvent.PlayerJoinReason.LEADER);
+		Bukkit.getServer().getPluginManager().callEvent(event);
+		if (event.isCancelled()) return;
+		
 		// if target player is currently leader, demote and replace him
 		if (targetFactionCurrentLeader == newLeader)
 		{

src/com/massivecraft/factions/cmd/CmdUnclaim.java

@@ -1,7 +1,10 @@
 package com.massivecraft.factions.cmd;
 
+import org.bukkit.Bukkit;
+
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.event.LandUnclaimEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.FLocation;
@@ -36,7 +39,7 @@ public class CmdUnclaim extends FCommand
 		Faction otherFaction = Board.getFactionAt(flocation);
 
 		if ( ! FPerm.TERRITORY.has(sender, otherFaction, true)) return;
-
+		
 		//String moneyBack = "<i>";
 		if (Econ.shouldBeUsed())
 		{
@@ -52,6 +55,10 @@ public class CmdUnclaim extends FCommand
 			}
 		}
 
+		LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(flocation, otherFaction.getId());
+		Bukkit.getServer().getPluginManager().callEvent(unclaimEvent);	
+		if(unclaimEvent.isCancelled()) return;
+		
 		Board.removeAt(flocation);
 		SpoutFeatures.updateTerritoryDisplayLoc(flocation);
 		myFaction.msg("%s<i> unclaimed some land.", fme.describeTo(myFaction, true));

src/com/massivecraft/factions/event/FPlayerJoinEvent.java

@@ -0,0 +1,60 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+
+public class FPlayerJoinEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+
+	FPlayer fplayer;
+	Faction faction;
+	PlayerJoinReason reason;
+	boolean cancelled = false;
+	public enum PlayerJoinReason
+	{
+		CREATE, LEADER, COMMAND
+	}
+	public FPlayerJoinEvent(FPlayer fp, Faction f, PlayerJoinReason r)
+	{ 
+		fplayer = fp;
+		faction = f;
+		reason = r;
+	}
+
+	public FPlayer getFPlayer()
+	{
+		return fplayer;
+	}
+	public Faction getFaction()
+	{
+		return faction;
+	}
+	public PlayerJoinReason getReason()
+	{
+		return reason;	
+	}
+	public HandlerList getHandlers() 
+	{
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() 
+	{
+		return handlers;
+	}
+	@Override
+	public boolean isCancelled() 
+	{
+		return cancelled;
+	}
+	@Override
+	public void setCancelled(boolean c) 
+	{
+		cancelled = c;
+	}
+}

src/com/massivecraft/factions/event/FPlayerLeaveEvent.java

@@ -0,0 +1,71 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+
+public class FPlayerLeaveEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+	private PlayerLeaveReason reason;
+	FPlayer FPlayer;
+	Faction Faction;
+	boolean cancelled = false;
+
+	public enum PlayerLeaveReason 
+	{
+		KICKED, DISBAND, RESET, JOINOTHER, LEAVE
+	}
+
+	public FPlayerLeaveEvent(FPlayer p, Faction f, PlayerLeaveReason r)
+	{
+		FPlayer = p;
+		Faction = f;
+		reason = r;
+	}
+
+	public HandlerList getHandlers() 
+	{
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() 
+	{
+		return handlers;
+	}
+	
+	public PlayerLeaveReason getReason() 
+	{
+		return reason;
+	}
+	
+	public FPlayer getFPlayer()
+	{
+		return FPlayer;
+	}
+	
+	public Faction getFaction()
+	{
+		return Faction;
+	}
+
+	@Override
+	public boolean isCancelled() 
+	{
+		return cancelled;
+	}
+
+	@Override
+	public void setCancelled(boolean c) 
+	{
+		if (reason == PlayerLeaveReason.DISBAND || reason == PlayerLeaveReason.RESET)
+		{
+			cancelled = false;
+			return;
+		}
+		cancelled = c;
+	}
+}

src/com/massivecraft/factions/event/FactionCreateEvent.java

@@ -0,0 +1,57 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FPlayers;
+
+public class FactionCreateEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+ 
+	private String factionTag;
+	private Player sender;
+	private boolean cancelled;
+	
+    public FactionCreateEvent(String tag, Player sender) 
+    {
+       this.factionTag = tag;
+       this.sender = sender;
+       this.cancelled = false;
+    }
+ 
+    public FPlayer getFPlayer()
+    {
+    	return FPlayers.i.get(sender);
+    }
+    
+    public String getFactionTag()
+    {
+    	return factionTag;
+    }
+    
+    public HandlerList getHandlers() 
+    {
+        return handlers;
+    }
+ 
+    public static HandlerList getHandlerList() 
+    {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() 
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean c) 
+    {
+        this.cancelled = c;
+    }
+}

src/com/massivecraft/factions/event/FactionDisbandEvent.java

@@ -0,0 +1,64 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FPlayers;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.Factions;
+
+public class FactionDisbandEvent extends Event implements Cancellable
+{
+    private static final HandlerList handlers = new HandlerList();
+
+    private boolean cancelled;
+    private String id;
+    private Player sender;
+
+    public FactionDisbandEvent(Player sender, String factionId)
+    {
+        cancelled = false;
+        this.sender = sender;
+        this.id = factionId;
+    }
+
+    public HandlerList getHandlers() 
+    {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() 
+    {
+        return handlers;
+    }
+
+    public Faction getFaction()
+    {
+        return Factions.i.get(id);
+    }
+
+    public FPlayer getFPlayer()
+    {
+        return FPlayers.i.get(sender);
+    }
+
+    public Player getPlayer()
+    {
+        return sender;
+    }
+
+    @Override
+    public boolean isCancelled() 
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean c) 
+    {
+        cancelled = c;
+    }
+}

src/com/massivecraft/factions/event/LandClaimEvent.java

@@ -0,0 +1,66 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FPlayers;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.Factions;
+
+public class LandClaimEvent extends Event implements Cancellable
+{
+	private static final HandlerList handlers = new HandlerList();
+
+	private boolean cancelled;
+	private FLocation location;
+	private String factionId, playerId;
+
+	public LandClaimEvent(FLocation loc, String id, String pid)
+	{
+		cancelled = false;
+		location = loc;
+		factionId = id;
+		playerId = pid;
+	}
+
+	public HandlerList getHandlers() 
+	{
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() 
+	{
+		return handlers;
+	}
+
+	public FPlayer getFPlayer()
+	{
+		return FPlayers.i.get(playerId);
+	}
+
+	public FLocation getLocation()
+	{
+		return this.location;
+	}
+
+	public Faction getFaction()
+	{
+		return Factions.i.get(factionId);
+	}
+
+	@Override
+	public boolean isCancelled() 
+	{
+		return cancelled;
+	}
+
+	@Override
+	public void setCancelled(boolean c) 
+	{
+		this.cancelled = c;
+	}
+
+}

src/com/massivecraft/factions/event/LandUnclaimEvent.java

@@ -0,0 +1,56 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.Factions;
+
+public class LandUnclaimEvent extends Event implements Cancellable
+{	
+	private static final HandlerList handlers = new HandlerList();
+
+	private boolean cancelled;
+	private String factionId;
+	private FLocation location;
+
+	public LandUnclaimEvent(FLocation loc, String id)
+	{
+		cancelled = false;
+		location = loc;
+		factionId = id;
+	}
+
+	public HandlerList getHandlers() 
+	{
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() 
+	{
+		return handlers;
+	}
+
+	public Faction getFaction()
+	{
+		return Factions.i.get(factionId);
+	}
+
+	public FLocation getLocation()
+	{
+		return this.location;
+	}
+
+	@Override
+	public boolean isCancelled() 
+	{
+		return cancelled;
+	}
+
+	@Override
+	public void setCancelled(boolean c) {
+		cancelled = c;
+	}
+}