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

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");