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

Starting to rename fplayer --> uplayer since we will need an mplayer.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 17:59:51 +02:00
parent e30c652759
commit 19f9834210
67 changed files with 407 additions and 411 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.Rel;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.Faction;
public abstract class FactionsChannelAbstract implements Channel
@@ -211,13 +211,13 @@ public abstract class FactionsChannelAbstract implements Channel
{
Set<Player> ret = new HashSet<Player>();
FPlayer fpsender = FPlayer.get(sender);
UPlayer fpsender = UPlayer.get(sender);
Faction faction = fpsender.getFaction();
String universe = fpsender.getUniverse();
for (Player player : Bukkit.getOnlinePlayers())
{
FPlayer frecipient = FPlayer.get(player);
UPlayer frecipient = UPlayer.get(player);
if (!frecipient.getUniverse().equals(universe)) continue;
if (!this.getTargetRelations().contains(faction.getRelationTo(frecipient))) continue;
ret.add(player);

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

@@ -10,7 +10,7 @@ import com.dthielke.herochat.ChannelChatEvent;
import com.dthielke.herochat.Herochat;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.chat.ChatFormatter;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.MConf;
@@ -54,7 +54,7 @@ public class HerochatEngine implements Listener
String format = event.getFormat();
format = format.replaceAll("&r", "§r");
format = ChatFormatter.format(format, FPlayer.get(event.getSender().getPlayer()), null);
format = ChatFormatter.format(format, UPlayer.get(event.getSender().getPlayer()), null);
event.setFormat(format);
}