This commit is contained in:
drtshock
2014-07-01 15:10:18 -05:00
parent 5066934a95
commit 8a6a97cc90
110 changed files with 3131 additions and 1228 deletions

View File

@@ -19,7 +19,9 @@ public class FPlayerJoinEvent extends Event implements Cancellable {
}
public FPlayerJoinEvent(FPlayer fp, Faction f, PlayerJoinReason r) {
fplayer = fp; faction = f; reason = r;
fplayer = fp;
faction = f;
reason = r;
}
public FPlayer getFPlayer() {

View File

@@ -18,7 +18,9 @@ public class FPlayerLeaveEvent extends Event implements Cancellable {
}
public FPlayerLeaveEvent(FPlayer p, Faction f, PlayerLeaveReason r) {
FPlayer = p; Faction = f; reason = r;
FPlayer = p;
Faction = f;
reason = r;
}
public HandlerList getHandlers() {
@@ -49,7 +51,9 @@ public class FPlayerLeaveEvent extends Event implements Cancellable {
@Override
public void setCancelled(boolean c) {
if (reason == PlayerLeaveReason.DISBAND || reason == PlayerLeaveReason.RESET) {
cancelled = false; return;
} cancelled = c;
cancelled = false;
return;
}
cancelled = c;
}
}

View File

@@ -16,7 +16,9 @@ public class FactionCreateEvent extends Event implements Cancellable {
private boolean cancelled;
public FactionCreateEvent(Player sender, String tag) {
this.factionTag = tag; this.sender = sender; this.cancelled = false;
this.factionTag = tag;
this.sender = sender;
this.cancelled = false;
}
public FPlayer getFPlayer() {

View File

@@ -17,7 +17,9 @@ public class FactionDisbandEvent extends Event implements Cancellable {
private Player sender;
public FactionDisbandEvent(Player sender, String factionId) {
cancelled = false; this.sender = sender; this.id = factionId;
cancelled = false;
this.sender = sender;
this.id = factionId;
}
public HandlerList getHandlers() {

View File

@@ -15,7 +15,10 @@ public class FactionRelationEvent extends Event {
private Relation frel;
public FactionRelationEvent(Faction sender, Faction target, Relation oldrel, Relation rel) {
fsender = sender; ftarget = target; foldrel = oldrel; frel = rel;
fsender = sender;
ftarget = target;
foldrel = oldrel;
frel = rel;
}
public HandlerList getHandlers() {

View File

@@ -16,7 +16,10 @@ public class FactionRenameEvent extends Event implements Cancellable {
private String tag;
public FactionRenameEvent(FPlayer sender, String newTag) {
fplayer = sender; faction = sender.getFaction(); tag = newTag; this.cancelled = false;
fplayer = sender;
faction = sender.getFaction();
tag = newTag;
this.cancelled = false;
}
public Faction getFaction() {

View File

@@ -17,7 +17,10 @@ public class LandClaimEvent extends Event implements Cancellable {
private FPlayer fplayer;
public LandClaimEvent(FLocation loc, Faction f, FPlayer p) {
cancelled = false; location = loc; faction = f; fplayer = p;
cancelled = false;
location = loc;
faction = f;
fplayer = p;
}
public HandlerList getHandlers() {

View File

@@ -13,7 +13,8 @@ public class LandUnclaimAllEvent extends Event {
private FPlayer fplayer;
public LandUnclaimAllEvent(Faction f, FPlayer p) {
faction = f; fplayer = p;
faction = f;
fplayer = p;
}
public HandlerList getHandlers() {

View File

@@ -17,7 +17,10 @@ public class LandUnclaimEvent extends Event implements Cancellable {
private FPlayer fplayer;
public LandUnclaimEvent(FLocation loc, Faction f, FPlayer p) {
cancelled = false; location = loc; faction = f; fplayer = p;
cancelled = false;
location = loc;
faction = f;
fplayer = p;
}
public HandlerList getHandlers() {

View File

@@ -17,7 +17,9 @@ public class PowerLossEvent extends Event implements Cancellable {
private String message;
public PowerLossEvent(Faction f, FPlayer p) {
cancelled = false; faction = f; fplayer = p;
cancelled = false;
faction = f;
fplayer = p;
}
@Override