EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More econ event moves

Browse Source
This commit is contained in:
Olof Larsson
2013-04-19 14:08:45 +02:00
parent f22ea3300f
commit c6739c4aa9
10 changed files with 130 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/com/massivecraft/factions/event/FactionsEventJoin.java
View File

@ -1,53 +0,0 @@
package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
public class FactionsEventJoin extends FactionsEventAbstractSender
{
// -------------------------------------------- //
// REQUIRED EVENT CODE
// -------------------------------------------- //
private static final HandlerList handlers = new HandlerList();
@Override public HandlerList getHandlers() { return handlers; }
public static HandlerList getHandlerList() { return handlers; }
// -------------------------------------------- //
// FIELDS
// -------------------------------------------- //
private final FPlayer fplayer;
public FPlayer getFPlayer() { return this.fplayer; }
private final Faction faction;
public Faction getFaction() { return this.faction; }
private final PlayerJoinReason reason;
public PlayerJoinReason getReason() { return reason; }
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public FactionsEventJoin(CommandSender sender, FPlayer fplayer, Faction faction, PlayerJoinReason reason)
{
super(sender);
this.fplayer = fplayer;
this.faction = faction;
this.reason = reason;
}
// -------------------------------------------- //
// INTERNAL ENUM
// -------------------------------------------- //
public enum PlayerJoinReason
{
CREATE, LEADER, JOIN
}
}

42
src/com/massivecraft/factions/event/FactionsEventLeave.java → src/com/massivecraft/factions/event/FactionsEventMembershipChange.java
View File

@ -6,7 +6,7 @@ import org.bukkit.event.HandlerList;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
public class FactionsEventLeave extends FactionsEventAbstractSender
public class FactionsEventMembershipChange extends FactionsEventAbstractSender
{
// -------------------------------------------- //
// REQUIRED EVENT CODE
@ -23,31 +23,28 @@ public class FactionsEventLeave extends FactionsEventAbstractSender
@Override
public void setCancelled(boolean cancelled)
{
if (this.reason == PlayerLeaveReason.DISBAND || this.reason == PlayerLeaveReason.RESET)
{
cancelled = false;
}
if (!this.reason.isCancellable()) cancelled = false;
super.setCancelled(cancelled);
}
private final FPlayer fplayer;
public FPlayer getFPlayer() { return this.fplayer; }
private final Faction faction;
public Faction getFaction() { return this.faction; }
private final Faction newFaction;
public Faction getNewFaction() { return this.newFaction; }
private final PlayerLeaveReason reason;
public PlayerLeaveReason getReason() { return this.reason; }
private final MembershipChangeReason reason;
public MembershipChangeReason getReason() { return this.reason; }
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public FactionsEventLeave(CommandSender sender, FPlayer fplayer, Faction faction, PlayerLeaveReason reason)
public FactionsEventMembershipChange(CommandSender sender, FPlayer fplayer, Faction newFaction, MembershipChangeReason reason)
{
super(sender);
this.fplayer = fplayer;
this.faction = faction;
this.newFaction = newFaction;
this.reason = reason;
}
@ -55,9 +52,28 @@ public class FactionsEventLeave extends FactionsEventAbstractSender
// INTERNAL ENUM
// -------------------------------------------- //
public enum PlayerLeaveReason
public enum MembershipChangeReason
{
KICKED, DISBAND, RESET, JOINOTHER, LEAVE
// Join
JOIN (true),
CREATE (false),
LEADER (true),
// Leave
LEAVE (true),
//JOINOTHER (true),
KICK (true),
DISBAND (false),
//RESET (false),
;
private final boolean cancellable;
public boolean isCancellable() { return this.cancellable; }
private MembershipChangeReason(boolean cancellable)
{
this.cancellable = cancellable;
}
}
}