F map autoupdate during flying fixed.
This commit is contained in:
@@ -12,10 +12,6 @@ public class FPlayerJoinEvent extends FactionPlayerEvent implements Cancellable
|
||||
PlayerJoinReason reason;
|
||||
boolean cancelled = false;
|
||||
|
||||
public enum PlayerJoinReason {
|
||||
CREATE, LEADER, COMMAND
|
||||
}
|
||||
|
||||
public FPlayerJoinEvent(FPlayer fp, Faction f, PlayerJoinReason r) {
|
||||
super(f, fp);
|
||||
reason = r;
|
||||
@@ -39,4 +35,8 @@ public class FPlayerJoinEvent extends FactionPlayerEvent implements Cancellable
|
||||
public void setCancelled(boolean c) {
|
||||
cancelled = c;
|
||||
}
|
||||
|
||||
public enum PlayerJoinReason {
|
||||
CREATE, LEADER, COMMAND
|
||||
}
|
||||
}
|
||||
@@ -6,12 +6,8 @@ import org.bukkit.event.Cancellable;
|
||||
|
||||
public class FPlayerLeaveEvent extends FactionPlayerEvent implements Cancellable {
|
||||
|
||||
private PlayerLeaveReason reason;
|
||||
boolean cancelled = false;
|
||||
|
||||
public enum PlayerLeaveReason {
|
||||
KICKED, DISBAND, RESET, JOINOTHER, LEAVE, BANNED
|
||||
}
|
||||
private PlayerLeaveReason reason;
|
||||
|
||||
public FPlayerLeaveEvent(FPlayer p, Faction f, PlayerLeaveReason r) {
|
||||
super(f, p);
|
||||
@@ -37,4 +33,8 @@ public class FPlayerLeaveEvent extends FactionPlayerEvent implements Cancellable
|
||||
// Don't let them cancel factions disbanding.
|
||||
cancelled = reason != PlayerLeaveReason.DISBAND && reason != PlayerLeaveReason.RESET && c;
|
||||
}
|
||||
|
||||
public enum PlayerLeaveReason {
|
||||
KICKED, DISBAND, RESET, JOINOTHER, LEAVE, BANNED
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,10 @@ public class FactionCreateEvent extends Event implements Cancellable {
|
||||
this.cancelled = false;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public FPlayer getFPlayer() {
|
||||
return FPlayers.getInstance().getByPlayer(sender);
|
||||
}
|
||||
@@ -36,10 +40,6 @@ public class FactionCreateEvent extends Event implements Cancellable {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCancelled() {
|
||||
return cancelled;
|
||||
|
||||
@@ -16,6 +16,10 @@ public class FactionEvent extends Event {
|
||||
this.faction = faction;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the Faction involved in the event.
|
||||
*
|
||||
@@ -29,8 +33,4 @@ public class FactionEvent extends Event {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -24,11 +24,11 @@ public class FactionRelationEvent extends Event {
|
||||
frel = rel;
|
||||
}
|
||||
|
||||
public HandlerList getHandlers() {
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user