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

Rename FPlayers --> FPlayerColl

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 13:22:23 +02:00
parent e3d6a4ec8e
commit a726e1c49f
28 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/FPlayer.java
View File

@@ -524,7 +524,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
if (myFaction.isNormal() && !perm && myFaction.getFPlayers().isEmpty())
{
// Remove this faction
for (FPlayer fplayer : FPlayers.i.getOnline())
for (FPlayer fplayer : FPlayerColl.i.getOnline())
{
fplayer.msg("<i>%s<i> was disbanded.", myFaction.describeTo(fplayer, true));
}

8
src/com/massivecraft/factions/FPlayers.java → src/com/massivecraft/factions/FPlayerColl.java
View File

@@ -10,13 +10,13 @@ import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;
public class FPlayers extends PlayerEntityCollection<FPlayer>
public class FPlayerColl extends PlayerEntityCollection<FPlayer>
{
public static FPlayers i = new FPlayers();
public static FPlayerColl i = new FPlayerColl();
Factions p = Factions.get();
private FPlayers()
private FPlayerColl()
{
super
(
@@ -58,7 +58,7 @@ public class FPlayers extends PlayerEntityCollection<FPlayer>
long now = System.currentTimeMillis();
double toleranceMillis = ConfServer.autoLeaveAfterDaysOfInactivity * 24 * 60 * 60 * 1000;
for (FPlayer fplayer : FPlayers.i.get())
for (FPlayer fplayer : FPlayerColl.i.get())
{
if (fplayer.isOffline() && now - fplayer.getLastLoginTime() > toleranceMillis)
{

8
src/com/massivecraft/factions/Faction.java
View File

@@ -374,7 +374,7 @@ public class Faction extends Entity implements EconomyParticipator
fplayers.clear();
if (this.isNone()) return;
for (FPlayer fplayer : FPlayers.i.get())
for (FPlayer fplayer : FPlayerColl.i.get())
{
if (fplayer.getFaction() == this)
{
@@ -454,7 +454,7 @@ public class Faction extends Entity implements EconomyParticipator
for (Player player: Factions.get().getServer().getOnlinePlayers())
{
FPlayer fplayer = FPlayers.i.get(player);
FPlayer fplayer = FPlayerColl.i.get(player);
if (fplayer.getFaction() == this)
{
ret.add(player);
@@ -490,7 +490,7 @@ public class Faction extends Entity implements EconomyParticipator
if (ConfServer.logFactionDisband)
Factions.get().log("The faction "+this.getTag()+" ("+this.getId()+") has been disbanded since it has no members left.");
for (FPlayer fplayer : FPlayers.i.getOnline())
for (FPlayer fplayer : FPlayerColl.i.getOnline())
{
fplayer.msg("The faction %s<i> was disbanded.", this.getTag(fplayer));
}
@@ -596,6 +596,6 @@ public class Faction extends Entity implements EconomyParticipator
Board.clean();
// Clean the fplayers
FPlayers.i.clean();
FPlayerColl.i.clean();
}
}

2
src/com/massivecraft/factions/FactionColl.java
View File

@@ -188,7 +188,7 @@ public class FactionColl extends EntityCollection<Faction>
{
p.log(Level.WARNING, "Non existing factionId "+id+" requested! Issuing cleaning!");
Board.clean();
FPlayers.i.clean();
FPlayerColl.i.clean();
}
return super.get(id);

8
src/com/massivecraft/factions/Factions.java
View File

@@ -102,7 +102,7 @@ public class Factions extends MPlugin
// Load Conf from disk
ConfServer.load();
FPlayers.i.loadFromDisc();
FPlayerColl.i.loadFromDisc();
FactionColl.i.loadFromDisc();
Board.load();
@@ -264,7 +264,7 @@ public class Factions extends MPlugin
if (speaker == null)
return tag;
FPlayer me = FPlayers.i.get(speaker);
FPlayer me = FPlayerColl.i.get(speaker);
if (me == null)
return tag;
@@ -272,7 +272,7 @@ public class Factions extends MPlugin
if (listener == null || !ConfServer.chatParseTagsColored) {
tag = me.getChatTag().trim();
} else {
FPlayer you = FPlayers.i.get(listener);
FPlayer you = FPlayerColl.i.get(listener);
if (you == null)
tag = me.getChatTag().trim();
else // everything checks out, give the colored tag
@@ -290,7 +290,7 @@ public class Factions extends MPlugin
if (player == null)
return "";
FPlayer me = FPlayers.i.get(player);
FPlayer me = FPlayerColl.i.get(player);
if (me == null)
return "";

6
src/com/massivecraft/factions/cmd/CmdCreate.java
View File

@@ -6,7 +6,7 @@ import org.bukkit.Bukkit;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions;
@@ -82,7 +82,7 @@ public class CmdCreate extends FCommand
faction.setTag(tag);
// trigger the faction join event for the creator
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.CREATE);
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayerColl.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.CREATE);
Bukkit.getServer().getPluginManager().callEvent(joinEvent);
// join event cannot be cancelled or you'll have an empty faction
@@ -90,7 +90,7 @@ public class CmdCreate extends FCommand
fme.setRole(Rel.LEADER);
fme.setFaction(faction);
for (FPlayer follower : FPlayers.i.getOnline())
for (FPlayer follower : FPlayerColl.i.getOnline())
{
follower.msg("%s<i> created a new faction %s", fme.describeTo(follower, true), faction.getTag(follower));
}

4
src/com/massivecraft/factions/cmd/CmdDescription.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.zcore.util.TextUtil;
@@ -42,7 +42,7 @@ public class CmdDescription extends FCommand
}
// Broadcast the description to everyone
for (FPlayer fplayer : FPlayers.i.getOnline())
for (FPlayer fplayer : FPlayerColl.i.getOnline())
{
fplayer.msg("<h>%s<i> changed their description to:", myFaction.describeTo(fplayer));
fplayer.sendMessage(myFaction.getDescription()); // players can inject "&" or "`" or "<i>" or whatever in their description, thus exploitable (masquerade as server messages or whatever); by the way, &k is particularly interesting looking

4
src/com/massivecraft/factions/cmd/CmdDisband.java
View File

@@ -6,7 +6,7 @@ import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.event.FactionDisbandEvent;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FPlayer;
@@ -60,7 +60,7 @@ public class CmdDisband extends FCommand
}
// Inform all players
for (FPlayer fplayer : FPlayers.i.getOnline())
for (FPlayer fplayer : FPlayerColl.i.getOnline())
{
String who = senderIsConsole ? "A server admin" : fme.describeTo(fplayer);
if (fplayer.getFaction() == faction)

4
src/com/massivecraft/factions/cmd/CmdHome.java
View File

@@ -11,7 +11,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.integration.EssentialsFeatures;
@@ -106,7 +106,7 @@ public class CmdHome extends FCommand
if (p == null || !p.isOnline() || p.isDead() || p == me || p.getWorld() != w)
continue;
FPlayer fp = FPlayers.i.get(p);
FPlayer fp = FPlayerColl.i.get(p);
if (fme.getRelationTo(fp) != Rel.ENEMY)
continue;

4
src/com/massivecraft/factions/cmd/CmdJoin.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.Bukkit;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
@@ -80,7 +80,7 @@ public class CmdJoin extends FCommand
if (samePlayer && ! canAffordCommand(ConfServer.econCostJoin, "to join a faction")) return;
// trigger the join event (cancellable)
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.COMMAND);
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayerColl.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.COMMAND);
Bukkit.getServer().getPluginManager().callEvent(joinEvent);
if (joinEvent.isCancelled()) return;

6
src/com/massivecraft/factions/cmd/CmdLeader.java
View File

@@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import org.bukkit.Bukkit;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.FPlayerJoinEvent;
@@ -70,7 +70,7 @@ public class CmdLeader extends FCommand
// only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
if (newLeader.getFaction() != targetFaction)
{
FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.i.get(me),targetFaction,FPlayerJoinEvent.PlayerJoinReason.LEADER);
FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayerColl.i.get(me),targetFaction,FPlayerJoinEvent.PlayerJoinReason.LEADER);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) return;
}
@@ -94,7 +94,7 @@ public class CmdLeader extends FCommand
msg("<i>You have promoted %s<i> to the position of faction leader.", newLeader.describeTo(fme, true));
// Inform all players
for (FPlayer fplayer : FPlayers.i.getOnline())
for (FPlayer fplayer : FPlayerColl.i.getOnline())
{
fplayer.msg("%s<i> gave %s<i> the leadership of %s<i>.", senderIsConsole ? "A server admin" : RelationUtil.describeThatToMe(fme, fplayer, true), newLeader.describeTo(fplayer), targetFaction.describeTo(fplayer));
}

6
src/com/massivecraft/factions/cmd/CmdReload.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
@@ -52,14 +52,14 @@ public class CmdReload extends FCommand
}
else if (file.startsWith("p"))
{
FPlayers.i.loadFromDisc();
FPlayerColl.i.loadFromDisc();
fileName = "players.json";
}
else if (file.startsWith("a"))
{
fileName = "all";
ConfServer.load();
FPlayers.i.loadFromDisc();
FPlayerColl.i.loadFromDisc();
FactionColl.i.loadFromDisc();
Board.load();
}

4
src/com/massivecraft/factions/cmd/CmdSaveAll.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Perm;
@@ -30,7 +30,7 @@ public class CmdSaveAll extends FCommand
@Override
public void perform()
{
FPlayers.i.saveToDisc();
FPlayerColl.i.saveToDisc();
FactionColl.i.saveToDisc();
Board.save();
ConfServer.save();

12
src/com/massivecraft/factions/cmd/FCommand.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions;
@@ -50,7 +50,7 @@ public abstract class FCommand extends MCommand<Factions>
{
if (sender instanceof Player)
{
this.fme = FPlayers.i.get((Player)sender);
this.fme = FPlayerColl.i.get((Player)sender);
this.myFaction = this.fme.getFaction();
}
else
@@ -95,7 +95,7 @@ public abstract class FCommand extends MCommand<Factions>
if ( ! (sender instanceof Player)) return false;
FPlayer fplayer = FPlayers.i.get((Player)sender);
FPlayer fplayer = FPlayerColl.i.get((Player)sender);
if ( ! fplayer.hasFaction())
{
@@ -157,7 +157,7 @@ public abstract class FCommand extends MCommand<Factions>
if (name != null)
{
FPlayer fplayer = FPlayers.i.get(name);
FPlayer fplayer = FPlayerColl.i.get(name);
if (fplayer != null)
{
ret = fplayer;
@@ -191,7 +191,7 @@ public abstract class FCommand extends MCommand<Factions>
if (name != null)
{
FPlayer fplayer = FPlayers.i.getBestIdMatch(name);
FPlayer fplayer = FPlayerColl.i.getBestIdMatch(name);
if (fplayer != null)
{
ret = fplayer;
@@ -242,7 +242,7 @@ public abstract class FCommand extends MCommand<Factions>
// Next we match player names
if (faction == null)
{
FPlayer fplayer = FPlayers.i.getBestIdMatch(name);
FPlayer fplayer = FPlayerColl.i.getBestIdMatch(name);
if (fplayer != null)
{
faction = fplayer.getFaction();

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

@@ -6,7 +6,7 @@ import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.FactionColl;
public class FactionCreateEvent extends Event implements Cancellable
@@ -26,7 +26,7 @@ public class FactionCreateEvent extends Event implements Cancellable
public FPlayer getFPlayer()
{
return FPlayers.i.get(sender);
return FPlayerColl.i.get(sender);
}
public String getFactionId()

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

@@ -6,7 +6,7 @@ import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
@@ -42,7 +42,7 @@ public class FactionDisbandEvent extends Event implements Cancellable
public FPlayer getFPlayer()
{
return FPlayers.i.get(sender);
return FPlayerColl.i.get(sender);
}
public Player getPlayer()

4
src/com/massivecraft/factions/integration/LWCFeatures.java
View File

@@ -15,7 +15,7 @@ import com.griefcraft.lwc.LWC;
import com.griefcraft.lwc.LWCPlugin;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
@@ -57,7 +57,7 @@ public class LWCFeatures
{
if(lwc.findProtection(chests.get(x)) != null)
{
if(!faction.getFPlayers().contains(FPlayers.i.get(lwc.findProtection(chests.get(x)).getOwner())))
if(!faction.getFPlayers().contains(FPlayerColl.i.get(lwc.findProtection(chests.get(x)).getOwner())))
lwc.findProtection(chests.get(x)).remove();
}
}

12
src/com/massivecraft/factions/integration/SpoutFeatures.java
View File

@@ -6,7 +6,7 @@ import java.util.Set;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Factions;
@@ -73,7 +73,7 @@ public class SpoutFeatures
for (Player player : fromPlayers)
{
FPlayer fplayer = FPlayers.i.get(player);
FPlayer fplayer = FPlayerColl.i.get(player);
SpoutPlayer splayer = SpoutManager.getPlayer(player);
Faction faction = fplayer.getFaction();
@@ -137,13 +137,13 @@ public class SpoutFeatures
for (Player player : fromPlayers)
{
FPlayer fplayer = FPlayers.i.get(player);
FPlayer fplayer = FPlayerColl.i.get(player);
SpoutPlayer splayer = SpoutManager.getPlayer(player);
Faction faction = fplayer.getFaction();
for (Player playerTo : toPlayers)
{
FPlayer fplayerTo = FPlayers.i.get(playerTo);
FPlayer fplayerTo = FPlayerColl.i.get(playerTo);
SpoutPlayer splayerTo = SpoutManager.getPlayer(playerTo);
Faction factionTo = fplayerTo.getFaction();
@@ -250,7 +250,7 @@ public class SpoutFeatures
{
if ( ! isEnabled()) return;
Set<FPlayer> players = FPlayers.i.getOnline();
Set<FPlayer> players = FPlayerColl.i.getOnline();
for (FPlayer player : players)
{
@@ -273,7 +273,7 @@ public class SpoutFeatures
{
if ( ! isEnabled()) return;
Set<FPlayer> players = FPlayers.i.getOnline();
Set<FPlayer> players = FPlayerColl.i.getOnline();
for (FPlayer player : players)
{

4
src/com/massivecraft/factions/integration/SpoutMainListener.java
View File

@@ -12,7 +12,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.TerritoryAccess;
@@ -29,7 +29,7 @@ public class SpoutMainListener implements Listener
@EventHandler(priority = EventPriority.NORMAL)
public void onSpoutCraftEnable(SpoutCraftEnableEvent event)
{
final FPlayer me = FPlayers.i.get(event.getPlayer());
final FPlayer me = FPlayerColl.i.get(event.getPlayer());
SpoutFeatures.updateTitle(me, null);
SpoutFeatures.updateTitle(null, me);

6
src/com/massivecraft/factions/integration/herochat/FactionsChannelAbstract.java
View File

@@ -23,7 +23,7 @@ import com.dthielke.herochat.MessageFormatSupplier;
import com.dthielke.herochat.MessageNotFoundException;
import com.dthielke.herochat.util.Messaging;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Rel;
@@ -213,11 +213,11 @@ public abstract class FactionsChannelAbstract implements Channel
{
Set<Player> ret = new HashSet<Player>();
FPlayer fpsender = FPlayers.i.get(sender);
FPlayer fpsender = FPlayerColl.i.get(sender);
Faction faction = fpsender.getFaction();
ret.addAll(faction.getOnlinePlayers());
for (FPlayer fplayer : FPlayers.i.getOnline())
for (FPlayer fplayer : FPlayerColl.i.getOnline())
{
if(this.getTargetRelations().contains(faction.getRelationTo(fplayer)))
{

4
src/com/massivecraft/factions/integration/herochat/HerochatListener.java
View File

@@ -9,7 +9,7 @@ import com.dthielke.herochat.ChannelChatEvent;
import com.dthielke.herochat.Herochat;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.listeners.FactionsChatListener;
@@ -34,7 +34,7 @@ public class HerochatListener implements Listener
if (ConfServer.chatTagHandledByAnotherPlugin) return;
Player from = event.getSender().getPlayer();
FPlayer fpfrom = FPlayers.i.get(from);
FPlayer fpfrom = FPlayerColl.i.get(from);
String format = event.getFormat();
format = format.replaceAll("&r", "§r");

4
src/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@@ -18,7 +18,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.FFlag;
@@ -66,7 +66,7 @@ public class FactionsBlockListener implements Listener
String name = player.getName();
if (ConfServer.playersWhoBypassAllProtection.contains(name)) return true;
FPlayer me = FPlayers.i.get(name);
FPlayer me = FPlayerColl.i.get(name);
if (me.hasAdminMode()) return true;
FLocation loc = new FLocation(location);

12
src/com/massivecraft/factions/listeners/FactionsChatListener.java
View File

@@ -23,7 +23,7 @@ import org.bukkit.plugin.RegisteredListener;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Rel;
@@ -87,7 +87,7 @@ public class FactionsChatListener implements Listener
if (ConfServer.chatTagHandledByAnotherPlugin) return;
Player from = event.getPlayer();
FPlayer fpfrom = FPlayers.i.get(from);
FPlayer fpfrom = FPlayerColl.i.get(from);
String format = event.getFormat();
String message = event.getMessage();
@@ -116,7 +116,7 @@ public class FactionsChatListener implements Listener
// 4. We send out the messages to each player with relation color.
for (Player to : event.getRecipients())
{
FPlayer fpto = FPlayers.i.get(to);
FPlayer fpto = FPlayerColl.i.get(to);
String formatWithColor = parseTags(format, from, fpfrom, to, fpto);
to.sendMessage(String.format(formatWithColor, from.getDisplayName(), message));
}
@@ -181,7 +181,7 @@ public class FactionsChatListener implements Listener
public static String parseTags(String str, Player from)
{
FPlayer fpfrom = FPlayers.i.get(from);
FPlayer fpfrom = FPlayerColl.i.get(from);
return parseTags(str, from, fpfrom, null, null);
}
public static String parseTags(String str, Player from, FPlayer fpfrom)
@@ -190,8 +190,8 @@ public class FactionsChatListener implements Listener
}
public static String parseTags(String str, Player from, Player to)
{
FPlayer fpfrom = FPlayers.i.get(from);
FPlayer fpto = FPlayers.i.get(to);
FPlayer fpfrom = FPlayerColl.i.get(from);
FPlayer fpto = FPlayerColl.i.get(to);
return parseTags(str, from, fpfrom, to, fpto);
}
public static String parseTags(String str, Player from, FPlayer fpfrom, Player to, FPlayer fpto)

10
src/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@@ -42,7 +42,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.event.PowerLossEvent;
@@ -67,7 +67,7 @@ public class FactionsEntityListener implements Listener
if ( ! (entity instanceof Player)) return;
Player player = (Player) entity;
FPlayer fplayer = FPlayers.i.get(player);
FPlayer fplayer = FPlayerColl.i.get(player);
Faction faction = Board.getFactionAt(new FLocation(player.getLocation()));
PowerLossEvent powerLossEvent = new PowerLossEvent(faction,fplayer);
@@ -230,7 +230,7 @@ public class FactionsEntityListener implements Listener
if ( ! (damagee instanceof Player)) return true;
FPlayer defender = FPlayers.i.get((Player)damagee);
FPlayer defender = FPlayerColl.i.get((Player)damagee);
if (defender == null || defender.getPlayer() == null)
return true;
@@ -254,7 +254,7 @@ public class FactionsEntityListener implements Listener
{
if (notify)
{
FPlayer attacker = FPlayers.i.get((Player)damager);
FPlayer attacker = FPlayerColl.i.get((Player)damager);
attacker.msg("<i>PVP is disabled in %s.", defLocFaction.describeTo(attacker));
}
return false;
@@ -265,7 +265,7 @@ public class FactionsEntityListener implements Listener
if ( ! (damager instanceof Player))
return true;
FPlayer attacker = FPlayers.i.get((Player)damager);
FPlayer attacker = FPlayerColl.i.get((Player)damager);
if (attacker == null || attacker.getPlayer() == null)
return true;

20
src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@@ -28,7 +28,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.struct.FFlag;
@@ -50,7 +50,7 @@ public class FactionsPlayerListener implements Listener
public void onPlayerJoin(PlayerJoinEvent event)
{
// Make sure that all online players do have a fplayer.
final FPlayer me = FPlayers.i.get(event.getPlayer());
final FPlayer me = FPlayerColl.i.get(event.getPlayer());
// Update the lastLoginTime for this fplayer
me.setLastLoginTime(System.currentTimeMillis());
@@ -64,7 +64,7 @@ public class FactionsPlayerListener implements Listener
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerQuit(PlayerQuitEvent event)
{
FPlayer me = FPlayers.i.get(event.getPlayer());
FPlayer me = FPlayerColl.i.get(event.getPlayer());
// Make sure player's power is up to date when they log off.
me.getPower();
@@ -91,7 +91,7 @@ public class FactionsPlayerListener implements Listener
return;
Player player = event.getPlayer();
FPlayer me = FPlayers.i.get(player);
FPlayer me = FPlayerColl.i.get(player);
// Did we change coord?
FLocation from = me.getLastStoodAt();
@@ -161,7 +161,7 @@ public class FactionsPlayerListener implements Listener
int count = attempt.increment();
if (count >= 10)
{
FPlayer me = FPlayers.i.get(name);
FPlayer me = FPlayerColl.i.get(name);
me.msg("<b>Ouch, that is starting to hurt. You should give it a rest.");
player.damage(NumberConversions.floor((double)count / 10));
}
@@ -207,7 +207,7 @@ public class FactionsPlayerListener implements Listener
String name = player.getName();
if (ConfServer.playersWhoBypassAllProtection.contains(name)) return true;
FPlayer me = FPlayers.i.get(name);
FPlayer me = FPlayerColl.i.get(name);
if (me.hasAdminMode()) return true;
if (ConfServer.materialsEditTools.contains(material) && ! FPerm.BUILD.has(me, loc, ! justCheck)) return false;
return true;
@@ -217,7 +217,7 @@ public class FactionsPlayerListener implements Listener
String name = player.getName();
if (ConfServer.playersWhoBypassAllProtection.contains(name)) return true;
FPlayer me = FPlayers.i.get(name);
FPlayer me = FPlayerColl.i.get(name);
if (me.hasAdminMode()) return true;
Location loc = block.getLocation();
Material material = block.getType();
@@ -233,7 +233,7 @@ public class FactionsPlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerRespawn(PlayerRespawnEvent event)
{
FPlayer me = FPlayers.i.get(event.getPlayer());
FPlayer me = FPlayerColl.i.get(event.getPlayer());
me.getPower(); // update power, so they won't have gained any while dead
@@ -293,7 +293,7 @@ public class FactionsPlayerListener implements Listener
{
// Get the player
Player player = event.getPlayer();
FPlayer me = FPlayers.i.get(player);
FPlayer me = FPlayerColl.i.get(player);
// With adminmode no commands are denied.
if (me.hasAdminMode()) return;
@@ -352,7 +352,7 @@ public class FactionsPlayerListener implements Listener
{
if (event.isCancelled()) return;
FPlayer badGuy = FPlayers.i.get(event.getPlayer());
FPlayer badGuy = FPlayerColl.i.get(event.getPlayer());
if (badGuy == null)
{
return;

6
src/com/massivecraft/factions/struct/FPerm.java
View File

@@ -13,7 +13,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
@@ -146,7 +146,7 @@ public enum FPerm
if (testSubject instanceof Player)
{
rpSubject = FPlayers.i.get((Player)testSubject);
rpSubject = FPlayerColl.i.get((Player)testSubject);
}
else if (testSubject instanceof RelationParticipator)
{
@@ -191,7 +191,7 @@ public enum FPerm
{
FPlayer notify = null;
if (testSubject instanceof Player)
notify = FPlayers.i.get((Player)testSubject);
notify = FPlayerColl.i.get((Player)testSubject);
else if (testSubject instanceof FPlayer)
notify = (FPlayer)testSubject;
if (notify != null)

6
src/com/massivecraft/factions/struct/TerritoryAccess.java
View File

@@ -22,7 +22,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonPrimitive;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
public class TerritoryAccess implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess>
@@ -77,7 +77,7 @@ public class TerritoryAccess implements JsonDeserializer<TerritoryAccess>, JsonS
if (testSubject instanceof String)
return hostFactionID.equals((String)testSubject);
else if (testSubject instanceof Player)
return hostFactionID.equals(FPlayers.i.get((Player)testSubject).getFactionId());
return hostFactionID.equals(FPlayerColl.i.get((Player)testSubject).getFactionId());
else if (testSubject instanceof FPlayer)
return hostFactionID.equals(((FPlayer)testSubject).getFactionId());
else if (testSubject instanceof Faction)
@@ -188,7 +188,7 @@ public class TerritoryAccess implements JsonDeserializer<TerritoryAccess>, JsonS
public boolean subjectHasAccess(Object testSubject)
{
if (testSubject instanceof Player)
return fPlayerHasAccess(FPlayers.i.get((Player)testSubject));
return fPlayerHasAccess(FPlayerColl.i.get((Player)testSubject));
else if (testSubject instanceof FPlayer)
return fPlayerHasAccess((FPlayer)testSubject);
else if (testSubject instanceof Faction)

4
src/com/massivecraft/factions/util/AutoLeaveTask.java
View File

@@ -1,7 +1,7 @@
package com.massivecraft.factions.util;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Factions;
public class AutoLeaveTask implements Runnable
@@ -15,7 +15,7 @@ public class AutoLeaveTask implements Runnable
public void run()
{
FPlayers.i.autoLeaveOnInactivityRoutine();
FPlayerColl.i.autoLeaveOnInactivityRoutine();
// maybe setting has been changed? if so, restart task at new rate
if (this.rate != ConfServer.autoLeaveRoutineRunsEveryXMinutes)