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

Loads of UPlayer --> MPlayer renames

Browse Source
This commit is contained in:
Olof Larsson
2014-09-17 13:29:58 +02:00
parent 529ae45ede
commit 0b60a5ad1a
43 changed files with 303 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,9 +152,9 @@ public class Econ
}
}
public static Set<MPlayer> getUPlayers(EconomyParticipator ep)
public static Set<MPlayer> getMPlayers(EconomyParticipator ep)
{
Set<MPlayer> uplayers = new HashSet<MPlayer>();
Set<MPlayer> mplayers = new HashSet<MPlayer>();
if (ep == null)
{
@@ -162,22 +162,22 @@ public class Econ
}
else if (ep instanceof MPlayer)
{
uplayers.add((MPlayer)ep);
mplayers.add((MPlayer)ep);
}
else if (ep instanceof Faction)
{
uplayers.addAll(((Faction)ep).getUPlayers());
mplayers.addAll(((Faction)ep).getMPlayers());
}
return uplayers;
return mplayers;
}
public static void sendTransferInfo(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount)
{
Set<MPlayer> recipients = new HashSet<MPlayer>();
recipients.addAll(getUPlayers(invoker));
recipients.addAll(getUPlayers(from));
recipients.addAll(getUPlayers(to));
recipients.addAll(getMPlayers(invoker));
recipients.addAll(getMPlayers(from));
recipients.addAll(getMPlayers(to));
if (invoker == null)
{

26
src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java
View File

@@ -652,11 +652,11 @@ public class EngineDynmap extends EngineAbstract
Set<String> ret = new HashSet<String>();
for (MPlayer uplayer : faction.getUPlayers())
for (MPlayer mplayer : faction.getMPlayers())
{
// NOTE: We add both UUID and name. This might be a good idea for future proofing.
ret.add(uplayer.getId());
ret.add(uplayer.getName());
ret.add(mplayer.getId());
ret.add(mplayer.getName());
}
return ret;
@@ -779,22 +779,22 @@ public class EngineDynmap extends EngineAbstract
}
// Players
List<MPlayer> playersList = faction.getUPlayers();
List<MPlayer> playersList = faction.getMPlayers();
String playersCount = String.valueOf(playersList.size());
String players = getPlayerString(playersList);
MPlayer playersLeaderObject = faction.getLeader();
String playersLeader = getPlayerName(playersLeaderObject);
List<MPlayer> playersOfficersList = faction.getUPlayersWhereRole(Rel.OFFICER);
List<MPlayer> playersOfficersList = faction.getMPlayersWhereRole(Rel.OFFICER);
String playersOfficersCount = String.valueOf(playersOfficersList.size());
String playersOfficers = getPlayerString(playersOfficersList);
List<MPlayer> playersMembersList = faction.getUPlayersWhereRole(Rel.MEMBER);
List<MPlayer> playersMembersList = faction.getMPlayersWhereRole(Rel.MEMBER);
String playersMembersCount = String.valueOf(playersMembersList.size());
String playersMembers = getPlayerString(playersMembersList);
List<MPlayer> playersRecruitsList = faction.getUPlayersWhereRole(Rel.RECRUIT);
List<MPlayer> playersRecruitsList = faction.getMPlayersWhereRole(Rel.RECRUIT);
String playersRecruitsCount = String.valueOf(playersRecruitsList.size());
String playersRecruits = getPlayerString(playersRecruitsList);
@@ -812,21 +812,21 @@ public class EngineDynmap extends EngineAbstract
return ret;
}
public static String getPlayerString(List<MPlayer> uplayers)
public static String getPlayerString(List<MPlayer> mplayers)
{
String ret = "";
for (MPlayer uplayer : uplayers)
for (MPlayer mplayer : mplayers)
{
if (ret.length() > 0) ret += ", ";
ret += getPlayerName(uplayer);
ret += getPlayerName(mplayer);
}
return ret;
}
public static String getPlayerName(MPlayer uplayer)
public static String getPlayerName(MPlayer mplayer)
{
if (uplayer == null) return "none";
return escapeHtml(uplayer.getName());
if (mplayer == null) return "none";
return escapeHtml(mplayer.getName());
}
public static String boolcolor(String string, boolean bool)

2
src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java
View File

@@ -72,7 +72,7 @@ public class EngineLwc implements Listener
public static void removeAlienProtections(PS chunkPs, Faction faction)
{
List<MPlayer> nonAliens = faction.getUPlayers();
List<MPlayer> nonAliens = faction.getMPlayers();
for (Protection protection : getProtectionsInChunk(chunkPs))
{
MPlayer owner = MPlayer.get(protection.getOwner());