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

more variable renames for FPlayer --> UPlayer

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 19:57:11 +02:00
parent 19f9834210
commit bc194efc9b
15 changed files with 104 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/factions/integration/Econ.java
View File

@ -167,9 +167,9 @@ public class Econ
return false;
}
public static Set<UPlayer> getFplayers(EconomyParticipator ep)
public static Set<UPlayer> getUPlayers(EconomyParticipator ep)
{
Set<UPlayer> fplayers = new HashSet<UPlayer>();
Set<UPlayer> uplayers = new HashSet<UPlayer>();
if (ep == null)
{
@ -177,22 +177,22 @@ public class Econ
}
else if (ep instanceof UPlayer)
{
fplayers.add((UPlayer)ep);
uplayers.add((UPlayer)ep);
}
else if (ep instanceof Faction)
{
fplayers.addAll(((Faction)ep).getUPlayers());
uplayers.addAll(((Faction)ep).getUPlayers());
}
return fplayers;
return uplayers;
}
public static void sendTransferInfo(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount)
{
Set<UPlayer> recipients = new HashSet<UPlayer>();
recipients.addAll(getFplayers(invoker));
recipients.addAll(getFplayers(from));
recipients.addAll(getFplayers(to));
recipients.addAll(getUPlayers(invoker));
recipients.addAll(getUPlayers(from));
recipients.addAll(getUPlayers(to));
if (invoker == null)
{

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

@ -72,9 +72,9 @@ public class SpoutFeatures
for (Player player : fromPlayers)
{
UPlayer fplayer = UPlayer.get(player);
UPlayer uplayer = UPlayer.get(player);
SpoutPlayer splayer = SpoutManager.getPlayer(player);
Faction faction = fplayer.getFaction();
Faction faction = uplayer.getFaction();
String cape = faction.getCape();
if (cape == null)
@ -137,19 +137,19 @@ public class SpoutFeatures
for (Player player : fromPlayers)
{
UPlayer fplayer = UPlayer.get(player);
UPlayer uplayer = UPlayer.get(player);
SpoutPlayer splayer = SpoutManager.getPlayer(player);
Faction faction = fplayer.getFaction();
Faction faction = uplayer.getFaction();
for (Player playerTo : toPlayers)
{
UPlayer fplayerTo = UPlayer.get(playerTo);
UPlayer uplayerTo = UPlayer.get(playerTo);
SpoutPlayer splayerTo = SpoutManager.getPlayer(playerTo);
Faction factionTo = fplayerTo.getFaction();
Faction factionTo = uplayerTo.getFaction();
ChatColor relationColor = faction.getRelationTo(factionTo).getColor();
String title = generateTitle(player, fplayer, faction, relationColor);
String title = generateTitle(player, uplayer, faction, relationColor);
boolean skip = onlyIfDifferent && title.equals(splayer.getTitleFor(splayerTo));
//Bukkit.getConsoleSender().sendMessage(P.p.txt.parse("<i>TITLE SKIP:<h>%s <i>FROM <h>%s <i>TO <h>%s <i>TITLE <h>%s", String.valueOf(skip), player.getDisplayName(), playerTo.getDisplayName(), title));
@ -178,7 +178,7 @@ public class SpoutFeatures
}, 5);
}
public static String generateTitle(Player player, UPlayer fplayer, Faction faction, ChatColor relationColor)
public static String generateTitle(Player player, UPlayer uplayer, Faction faction, ChatColor relationColor)
{
String ret = null;
@ -189,12 +189,12 @@ public class SpoutFeatures
String addTag = "";
if (ConfServer.spoutFactionTagsOverNames)
{
addTag += relationColor.toString() + fplayer.getRole().getPrefix() + faction.getTag();
addTag += relationColor.toString() + uplayer.getRole().getPrefix() + faction.getTag();
}
if (ConfServer.spoutFactionTitlesOverNames && fplayer.hasTitle())
if (ConfServer.spoutFactionTitlesOverNames && uplayer.hasTitle())
{
addTag += (addTag.isEmpty() ? "" : " ") + fplayer.getTitle();
addTag += (addTag.isEmpty() ? "" : " ") + uplayer.getTitle();
}
ret = addTag + "\n" + ret;
@ -222,8 +222,8 @@ public class SpoutFeatures
}
else if (o instanceof UPlayer)
{
UPlayer fplayer = (UPlayer)o;
Player player = fplayer.getPlayer();
UPlayer uplayer = (UPlayer)o;
Player player = uplayer.getPlayer();
if (player != null)
{
ret.add(player);
@ -252,14 +252,14 @@ public class SpoutFeatures
for (Player player : Bukkit.getOnlinePlayers())
{
UPlayer fplayer = UPlayer.get(player);
UPlayer uplayer = UPlayer.get(player);
if (chunk == null)
{
mainListener.updateTerritoryDisplay(fplayer, false);
mainListener.updateTerritoryDisplay(uplayer, false);
}
else if (fplayer.getCurrentChunk().equals(chunk))
else if (uplayer.getCurrentChunk().equals(chunk))
{
mainListener.updateTerritoryDisplay(fplayer, true);
mainListener.updateTerritoryDisplay(uplayer, true);
}
}
}
@ -280,10 +280,10 @@ public class SpoutFeatures
for (Player player : Bukkit.getOnlinePlayers())
{
UPlayer fplayer = UPlayer.get(player);
if (chunk == null || fplayer.getCurrentChunk().equals(chunk))
UPlayer uplayer = UPlayer.get(player);
if (chunk == null || uplayer.getCurrentChunk().equals(chunk))
{
mainListener.updateAccessInfo(fplayer);
mainListener.updateAccessInfo(uplayer);
}
}
}

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

@ -264,65 +264,6 @@ public abstract class FactionsChannelAbstract implements Channel
Herochat.logChat(msg);
}
/*@Override
public void processChat(ChannelChatEvent event)
{
final Player player = event.getSender().getPlayer();
String format = applyFormat(event.getFormat(), event.getBukkitFormat(), player);
Chatter sender = Herochat.getChatterManager().getChatter(player);
Set<Player> recipients = new HashSet<Player>(Arrays.asList(Bukkit.getOnlinePlayers()));
trimRecipients(recipients, sender);
if (!isMessageHeard(recipients, sender))
{
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Herochat.getPlugin(), new Runnable()
{
public void run()
{
try
{
Messaging.send(player, Herochat.getMessage("channel_alone"));
}
catch (MessageNotFoundException e)
{
Herochat.severe("Messages.properties is missing: channel_alone");
}
}
}, 1L);
}
FPlayer fplayer = FPlayers.i.get(player);
String formatWithoutColor = FactionsChatListener.parseTags(format, player, fplayer);
//String msg = String.format(format, player.getDisplayName(), event.getMessage());
for (Player recipient : recipients)
{
String finalFormat;
if ( ! Conf.chatParseTags || Conf.chatTagHandledByAnotherPlugin)
{
finalFormat = format;
}
else if (! Conf.chatParseTagsColored)
{
finalFormat = formatWithoutColor;
}
else
{
FPlayer frecipient = FPlayers.i.get(recipient);
finalFormat = FactionsChatListener.parseTags(format, player, fplayer, recipient, frecipient);
}
String msg = String.format(finalFormat, player.getDisplayName(), event.getMessage());
recipient.sendMessage(msg);
}
Herochat.logChat(String.format(formatWithoutColor, player.getDisplayName(), event.getMessage()));
}*/
public boolean isMessageHeard(Set<Player> recipients, Chatter sender)
{
if (!isLocal()) return true;