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

Fixed a bug with the smoke effect for the faction home and one NPE.

Browse Source
This commit is contained in:
Olof Larsson
2011-10-13 22:49:41 +02:00
parent 88fe43d600
commit 618c5fceed
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,20 +56,17 @@ public class RelationUtil
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