Loads of UPlayer --> MPlayer renames

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

View File

@@ -40,18 +40,18 @@ public class RelationUtil
}
else if (that instanceof MPlayer)
{
MPlayer uplayerthat = (MPlayer) that;
MPlayer mplayerthat = (MPlayer) that;
if (that == me)
{
ret = "you";
}
else if (thatFaction == myFaction)
{
ret = uplayerthat.getNameAndTitle(myFaction);
ret = mplayerthat.getNameAndTitle(myFaction);
}
else
{
ret = uplayerthat.getNameAndFactionName();
ret = mplayerthat.getNameAndFactionName();
}
}