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

Cleaning sweep, mainly for various stray "4 spaces" indentions to tabs

Browse Source
This commit is contained in:
Brettflan
2012-03-13 08:27:03 -05:00
parent 28269b7455
commit 18b10ce8f9
18 changed files with 278 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/com/massivecraft/factions/event/FactionCreateEvent.java
View File

@ -17,47 +17,47 @@ public class FactionCreateEvent extends Event implements Cancellable
private Player sender;
private boolean cancelled;
public FactionCreateEvent(Player sender, String tag)
{
this.factionTag = tag;
this.sender = sender;
this.cancelled = false;
}
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();
}
public FPlayer getFPlayer()
{
return FPlayers.i.get(sender);
}
public String getFactionId()
{
return Factions.i.getNextId();
}
public String getFactionTag()
{
return factionTag;
}
public String getFactionTag()
{
return factionTag;
}
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;
}
}

80
src/com/massivecraft/factions/event/FactionDisbandEvent.java
View File

@ -12,53 +12,53 @@ import com.massivecraft.factions.Factions;
public class FactionDisbandEvent extends Event implements Cancellable
{
private static final HandlerList handlers = new HandlerList();
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;
}
}

76
src/com/massivecraft/factions/event/FactionRelationEvent.java
View File

@ -7,50 +7,50 @@ import com.massivecraft.factions.struct.Rel;
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 Rel foldrel;
private Rel frel;
private Faction fsender;
private Faction ftarget;
private Rel foldrel;
private Rel frel;
public FactionRelationEvent(Faction sender, Faction target, Rel oldrel, Rel rel)
{
fsender = sender;
ftarget = target;
foldrel = oldrel;
frel = rel;
}
public FactionRelationEvent(Faction sender, Faction target, Rel oldrel, Rel 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 Rel getOldRelation()
{
return foldrel;
}
public Rel getOldRelation()
{
return foldrel;
}
public Rel getRelation()
{
return frel;
}
public Rel getRelation()
{
return frel;
}
public Faction getFaction()
{
return fsender;
}
public Faction getTargetFaction()
{
return ftarget;
}
public Faction getFaction()
{
return fsender;
}
public Faction getTargetFaction()
{
return ftarget;
}
}

103
src/com/massivecraft/factions/event/FactionRenameEvent.java
View File

@ -8,66 +8,67 @@ 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;
}
}

15
src/com/massivecraft/factions/event/LandClaimEvent.java
View File

@ -37,23 +37,23 @@ public class LandClaimEvent extends Event implements Cancellable
}
public FLocation getLocation()
{
return this.location;
}
{
return this.location;
}
public Faction getFaction()
{
return faction;
return faction;
}
public String getFactionId()
{
return faction.getId();
return faction.getId();
}
public String getFactionTag()
{
return faction.getTag();
return faction.getTag();
}
public FPlayer getFPlayer()
@ -63,7 +63,7 @@ public class LandClaimEvent extends Event implements Cancellable
public Player getPlayer()
{
return fplayer.getPlayer();
return fplayer.getPlayer();
}
@Override
@ -77,5 +77,4 @@ public class LandClaimEvent extends Event implements Cancellable
{
this.cancelled = c;
}
}

47
src/com/massivecraft/factions/event/LandUnclaimAllEvent.java
View File

@ -3,7 +3,6 @@ package com.massivecraft.factions.event;
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;
@ -12,11 +11,8 @@ public class LandUnclaimAllEvent extends Event
{
private static final HandlerList handlers = new HandlerList();
// Location is commented out because there is no clean way to hook currently.
// faction and fplayer should be enough to filter needed information.
// private FLocation[] location;
private Faction faction;
private FPlayer fplayer;
private Faction faction;
private FPlayer fplayer;
public LandUnclaimAllEvent(Faction f, FPlayer p)
{
@ -34,35 +30,28 @@ public class LandUnclaimAllEvent extends Event
return handlers;
}
/*
public FLocation getLocation()
{
return this.location;
}
*/
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();
}
}

40
src/com/massivecraft/factions/event/LandUnclaimEvent.java
View File

@ -14,9 +14,9 @@ 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 FLocation location;
private Faction faction;
private FPlayer fplayer;
public LandUnclaimEvent(FLocation loc, Faction f, FPlayer p)
{
@ -38,7 +38,7 @@ public class LandUnclaimEvent extends Event implements Cancellable
public FLocation getLocation()
{
return this.location;
return this.location;
}
public Faction getFaction()
@ -46,25 +46,25 @@ public class LandUnclaimEvent extends Event implements Cancellable
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()