SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformat before I go crazy.

Browse Source
This commit is contained in:
drtshock
2014-04-04 13:55:21 -05:00
parent 0c3ea377dd
commit 814e439705
124 changed files with 11302 additions and 13164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/main/java/com/massivecraft/factions/event/FPlayerJoinEvent.java
View File

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

102
src/main/java/com/massivecraft/factions/event/FPlayerLeaveEvent.java
View File

@@ -1,71 +1,59 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
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 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 enum PlayerLeaveReason
{
KICKED, DISBAND, RESET, JOINOTHER, LEAVE
}
public FPlayerLeaveEvent(FPlayer p, Faction f, PlayerLeaveReason r) {
FPlayer = p;
Faction = f;
reason = r;
}
public FPlayerLeaveEvent(FPlayer p, Faction f, PlayerLeaveReason r)
{
FPlayer = p;
Faction = f;
reason = r;
}
public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public PlayerLeaveReason getReason()
{
return reason;
}
public FPlayer getFPlayer()
{
return FPlayer;
}
public Faction getFaction()
{
return Faction;
}
public PlayerLeaveReason getReason() {
return reason;
}
@Override
public boolean isCancelled()
{
return cancelled;
}
public FPlayer getFPlayer() {
return FPlayer;
}
@Override
public void setCancelled(boolean c)
{
if (reason == PlayerLeaveReason.DISBAND || reason == PlayerLeaveReason.RESET)
{
cancelled = false;
return;
}
cancelled = c;
}
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;
}
}

90
src/main/java/com/massivecraft/factions/event/FactionCreateEvent.java
View File

@@ -1,63 +1,53 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Factions;
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.Factions;
public class FactionCreateEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
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(Player sender, String tag)
{
this.factionTag = tag;
this.sender = sender;
this.cancelled = false;
}
public FPlayer getFPlayer()
{
return FPlayers.i.get(sender);
}
public String getFactionId()
{
return Factions.i.getNextId();
}
private String factionTag;
private Player sender;
private boolean cancelled;
public String getFactionTag()
{
return factionTag;
}
public FactionCreateEvent(Player sender, String tag) {
this.factionTag = tag;
this.sender = sender;
this.cancelled = false;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public FPlayer getFPlayer() {
return FPlayers.i.get(sender);
}
@Override
public boolean isCancelled()
{
return cancelled;
}
public String getFactionId() {
return Factions.i.getNextId();
}
@Override
public void setCancelled(boolean c)
{
this.cancelled = c;
}
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;
}
}

84
src/main/java/com/massivecraft/factions/event/FactionDisbandEvent.java
View File

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

73
src/main/java/com/massivecraft/factions/event/FactionRelationEvent.java
View File

@@ -1,56 +1,47 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Relation;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.Faction;
public class FactionRelationEvent extends Event {
private static final HandlerList handlers = new HandlerList();
public class FactionRelationEvent extends Event
{
private static final HandlerList handlers = new HandlerList();
private Faction fsender;
private Faction ftarget;
private Relation foldrel;
private Relation frel;
private Faction fsender;
private Faction ftarget;
private Relation foldrel;
private Relation frel;
public FactionRelationEvent(Faction sender, Faction target, Relation oldrel, Relation rel) {
fsender = sender;
ftarget = target;
foldrel = oldrel;
frel = rel;
}
public FactionRelationEvent(Faction sender, Faction target, Relation oldrel, Relation rel)
{
fsender = sender;
ftarget = target;
foldrel = oldrel;
frel = rel;
}
public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public Relation getOldRelation() {
return foldrel;
}
public Relation getOldRelation()
{
return foldrel;
}
public Relation getRelation() {
return frel;
}
public Relation getRelation()
{
return frel;
}
public Faction getFaction() {
return fsender;
}
public Faction getFaction()
{
return fsender;
}
public Faction getTargetFaction()
{
return ftarget;
}
public Faction getTargetFaction() {
return ftarget;
}
}

98
src/main/java/com/massivecraft/factions/event/FactionRenameEvent.java
View File

@@ -1,74 +1,62 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
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.Faction;
public class FactionRenameEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
public class FactionRenameEvent extends Event implements Cancellable
{
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private FPlayer fplayer;
private Faction faction;
private String tag;
private boolean cancelled;
private FPlayer fplayer;
private Faction faction;
private String tag;
public FactionRenameEvent(FPlayer sender, String newTag) {
fplayer = sender;
faction = sender.getFaction();
tag = newTag;
this.cancelled = false;
}
public FactionRenameEvent(FPlayer sender, String newTag)
{
fplayer = sender;
faction = sender.getFaction();
tag = newTag;
this.cancelled = false;
}
public Faction getFaction() {
return (faction);
}
public Faction getFaction()
{
return(faction);
}
public FPlayer getFPlayer() {
return (fplayer);
}
public FPlayer getFPlayer()
{
return(fplayer);
}
public Player getPlayer() {
return (fplayer.getPlayer());
}
public Player getPlayer()
{
return(fplayer.getPlayer());
}
public String getOldFactionTag() {
return (faction.getTag());
}
public String getOldFactionTag()
{
return(faction.getTag());
}
public String getFactionTag() {
return (tag);
}
public String getFactionTag()
{
return(tag);
}
public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public boolean isCancelled()
{
return cancelled;
}
@Override
public void setCancelled(boolean c)
{
this.cancelled = c;
}
@Override
public void setCancelled(boolean c) {
this.cancelled = c;
}
}

109
src/main/java/com/massivecraft/factions/event/LandClaimEvent.java
View File

@@ -1,80 +1,67 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import org.bukkit.entity.Player;
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.FPlayer;
import org.bukkit.entity.Player;
public class LandClaimEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
public class LandClaimEvent extends Event implements Cancellable
{
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private FLocation location;
private Faction faction;
private FPlayer fplayer;
private boolean cancelled;
private FLocation location;
private Faction faction;
private FPlayer fplayer;
public LandClaimEvent(FLocation loc, Faction f, FPlayer p) {
cancelled = false;
location = loc;
faction = f;
fplayer = p;
}
public LandClaimEvent(FLocation loc, Faction f, FPlayer p)
{
cancelled = false;
location = loc;
faction = f;
fplayer = p;
}
public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public FLocation getLocation() {
return this.location;
}
public FLocation getLocation()
{
return this.location;
}
public Faction getFaction() {
return faction;
}
public Faction getFaction()
{
return faction;
}
public String getFactionId() {
return faction.getId();
}
public String getFactionId()
{
return faction.getId();
}
public String getFactionTag() {
return faction.getTag();
}
public String getFactionTag()
{
return faction.getTag();
}
public FPlayer getFPlayer() {
return fplayer;
}
public FPlayer getFPlayer()
{
return fplayer;
}
public Player getPlayer() {
return fplayer.getPlayer();
}
public Player getPlayer()
{
return fplayer.getPlayer();
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public boolean isCancelled()
{
return cancelled;
}
@Override
public void setCancelled(boolean c)
{
this.cancelled = c;
}
@Override
public void setCancelled(boolean c) {
this.cancelled = c;
}
}

74
src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java
View File

@@ -1,57 +1,47 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FPlayer;
import org.bukkit.entity.Player;
public class LandUnclaimAllEvent extends Event {
private static final HandlerList handlers = new HandlerList();
public class LandUnclaimAllEvent extends Event
{
private static final HandlerList handlers = new HandlerList();
private Faction faction;
private FPlayer fplayer;
private Faction faction;
private FPlayer fplayer;
public LandUnclaimAllEvent(Faction f, FPlayer p) {
faction = f;
fplayer = p;
}
public LandUnclaimAllEvent(Faction f, FPlayer p)
{
faction = f;
fplayer = p;
}
public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public Faction getFaction() {
return faction;
}
public Faction getFaction()
{
return faction;
}
public String getFactionId() {
return faction.getId();
}
public String getFactionId()
{
return faction.getId();
}
public String getFactionTag() {
return faction.getTag();
}
public String getFactionTag()
{
return faction.getTag();
}
public FPlayer getFPlayer() {
return fplayer;
}
public FPlayer getFPlayer()
{
return fplayer;
}
public Player getPlayer()
{
return fplayer.getPlayer();
}
public Player getPlayer() {
return fplayer.getPlayer();
}
}

108
src/main/java/com/massivecraft/factions/event/LandUnclaimEvent.java
View File

@@ -1,79 +1,67 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import org.bukkit.entity.Player;
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.FPlayer;
import org.bukkit.entity.Player;
public class LandUnclaimEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
public class LandUnclaimEvent extends Event implements Cancellable
{
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private FLocation location;
private Faction faction;
private FPlayer fplayer;
private boolean cancelled;
private FLocation location;
private Faction faction;
private FPlayer fplayer;
public LandUnclaimEvent(FLocation loc, Faction f, FPlayer p) {
cancelled = false;
location = loc;
faction = f;
fplayer = p;
}
public LandUnclaimEvent(FLocation loc, Faction f, FPlayer p)
{
cancelled = false;
location = loc;
faction = f;
fplayer = p;
}
public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers()
{
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public FLocation getLocation() {
return this.location;
}
public FLocation getLocation()
{
return this.location;
}
public Faction getFaction() {
return faction;
}
public Faction getFaction()
{
return faction;
}
public String getFactionId() {
return faction.getId();
}
public String getFactionId()
{
return faction.getId();
}
public String getFactionTag() {
return faction.getTag();
}
public String getFactionTag()
{
return faction.getTag();
}
public FPlayer getFPlayer() {
return fplayer;
}
public FPlayer getFPlayer()
{
return fplayer;
}
public Player getPlayer() {
return fplayer.getPlayer();
}
public Player getPlayer()
{
return fplayer.getPlayer();
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public boolean isCancelled()
{
return cancelled;
}
@Override
public void setCancelled(boolean c) {
cancelled = c;
}
@Override
public void setCancelled(boolean c) {
cancelled = c;
}
}

113
src/main/java/com/massivecraft/factions/event/PowerLossEvent.java
View File

@@ -1,85 +1,72 @@
package com.massivecraft.factions.event;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
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.Faction;
import org.bukkit.entity.Player;
public class PowerLossEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private Faction faction;
private FPlayer fplayer;
private String message;
public class PowerLossEvent extends Event implements Cancellable
{
private static final HandlerList handlers = new HandlerList();
public PowerLossEvent(Faction f, FPlayer p) {
cancelled = false;
faction = f;
fplayer = p;
}
private boolean cancelled;
private Faction faction;
private FPlayer fplayer;
private String message;
@Override
public HandlerList getHandlers() {
return handlers;
}
public PowerLossEvent(Faction f, FPlayer p)
{
cancelled = false;
faction = f;
fplayer = p;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers()
{
return handlers;
}
public Faction getFaction() {
return faction;
}
public static HandlerList getHandlerList()
{
return handlers;
}
public String getFactionId() {
return faction.getId();
}
public Faction getFaction()
{
return faction;
}
public String getFactionTag() {
return faction.getTag();
}
public String getFactionId()
{
return faction.getId();
}
public FPlayer getFPlayer() {
return fplayer;
}
public String getFactionTag()
{
return faction.getTag();
}
public Player getPlayer() {
return fplayer.getPlayer();
}
public FPlayer getFPlayer()
{
return fplayer;
}
public String getMessage() {
return message;
}
public Player getPlayer()
{
return fplayer.getPlayer();
}
public void setMessage(String message) {
this.message = message;
}
public String getMessage() {
return message;
}
@Override
public boolean isCancelled() {
return cancelled;
}
public void setMessage(String message) {
this.message = message;
}
@Override
public boolean isCancelled()
{
return cancelled;
}
@Override
public void setCancelled(boolean c)
{
this.cancelled = c;
}
@Override
public void setCancelled(boolean c) {
this.cancelled = c;
}
}