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

Some of the bugs are fixed.

Browse Source
This commit is contained in:
Olof Larsson
2011-10-12 18:48:47 +02:00
parent 2566edfd8c
commit f25daa228a
25 changed files with 132 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/com/massivecraft/factions/util/RelationUtil.java
View File

@ -13,32 +13,32 @@ public class RelationUtil
public static String describeThatToMe(RelationParticipator that, RelationParticipator me, boolean ucfirst)
{
String ret = "";
Faction fthat = getFaction(that);
if (fthat == null) return "ERROR"; // ERROR
Faction fme = getFaction(me);
if (fme == null) return "ERROR"; // ERROR
Faction thatFaction = getFaction(that);
if (thatFaction == null) return "ERROR"; // ERROR
Faction myFaction = getFaction(me);
if (myFaction == null) return "ERROR"; // ERROR
if (that instanceof Faction)
{
if (me instanceof FPlayer && fme == fthat)
if (me instanceof FPlayer && myFaction == thatFaction)
{
ret = "your faction";
}
else
{
ret = "the faction "+fthat.getTag();
ret = "the faction " + thatFaction.getTag();
}
}
else if(that instanceof FPlayer)
else if (that instanceof FPlayer)
{
FPlayer fplayerthat = (FPlayer)that;
FPlayer fplayerthat = (FPlayer) that;
if (that == me)
{
ret = "you";
}
else if (fthat == fme)
else if (thatFaction == myFaction)
{
ret = fplayerthat.getNameAndTitle();
}
@ -47,73 +47,77 @@ public class RelationUtil
ret = fplayerthat.getNameAndTag();
}
}
if (ucfirst)
{
ret = TextUtil.upperCaseFirst(ret);
}
return ""+getRelationColor(me, that)+ret;
return "" + getRelationColor(me, that) + ret;
}
public static String describeThatToMe(RelationParticipator that, RelationParticipator me)
public static String describeThatToMe(RelationParticipator that,
RelationParticipator me)
{
return describeThatToMe(that, me, false);
}
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that)
public static Relation getRelationTo(RelationParticipator me,
RelationParticipator that)
{
return getRelationTo(that, me, false);
}
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that, boolean ignorePeaceful)
public static Relation getRelationTo(RelationParticipator me,
RelationParticipator that, boolean ignorePeaceful)
{
Faction fthat = getFaction(that);
if (fthat == null) return Relation.NEUTRAL; // ERROR
Faction fme = getFaction(me);
if (fme == null) return Relation.NEUTRAL; // ERROR
if ( ! fthat.isNormal() || ! fme.isNormal())
if (!fthat.isNormal() || !fme.isNormal())
{
return Relation.NEUTRAL;
}
if (fthat.equals(fme))
{
return Relation.MEMBER;
}
if ( ! ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful()))
if (!ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful()))
{
return Relation.NEUTRAL;
}
if(fme.getRelationWish(fthat).value >= fthat.getRelationWish(fme).value)
if (fme.getRelationWish(fthat).value >= fthat.getRelationWish(fme).value)
{
return fthat.getRelationWish(fme);
}
return fme.getRelationWish(fthat);
}
public static Faction getFaction(RelationParticipator rp)
{
if (rp instanceof Faction)
{
return (Faction)rp;
return (Faction) rp;
}
if (rp instanceof FPlayer)
{
return ((FPlayer)rp).getFaction();
return ((FPlayer) rp).getFaction();
}
// ERROR
return null;
}
public static ChatColor getRelationColor(RelationParticipator me, RelationParticipator that)
public static ChatColor getRelationColor(RelationParticipator me,
RelationParticipator that)
{
return getRelationTo(that, me).getColor();
}