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

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