SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More reformatting

Browse Source
This commit is contained in:
drtshock
2014-07-01 14:52:40 -05:00
parent dc54f78cc1
commit 5066934a95
109 changed files with 1288 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/massivecraft/factions/util/RelationUtil.java
View File

@@ -12,8 +12,7 @@ public class RelationUtil {
public static String describeThatToMe(RelationParticipator that, RelationParticipator me, boolean ucfirst) {
String ret = "";
Faction thatFaction = getFaction(that);
if (thatFaction == null) {
Faction thatFaction = getFaction(that); if (thatFaction == null) {
return "ERROR"; // ERROR
}
@@ -23,20 +22,15 @@ public class RelationUtil {
if (that instanceof Faction) {
if (me instanceof FPlayer && myFaction == thatFaction) {
ret = "your faction";
}
else {
} else {
ret = thatFaction.getTag();
}
}
else if (that instanceof FPlayer) {
FPlayer fplayerthat = (FPlayer) that;
if (that == me) {
} else if (that instanceof FPlayer) {
FPlayer fplayerthat = (FPlayer) that; if (that == me) {
ret = "you";
}
else if (thatFaction == myFaction) {
} else if (thatFaction == myFaction) {
ret = fplayerthat.getNameAndTitle();
}
else {
} else {
ret = fplayerthat.getNameAndTag();
}
}
@@ -57,13 +51,11 @@ public class RelationUtil {
}
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that, boolean ignorePeaceful) {
Faction fthat = getFaction(that);
if (fthat == null) {
Faction fthat = getFaction(that); if (fthat == null) {
return Relation.NEUTRAL; // ERROR
}
Faction fme = getFaction(me);
if (fme == null) {
Faction fme = getFaction(me); if (fme == null) {
return Relation.NEUTRAL; // ERROR
}
@@ -100,8 +92,7 @@ public class RelationUtil {
}
public static ChatColor getColorOfThatToMe(RelationParticipator that, RelationParticipator me) {
Faction thatFaction = getFaction(that);
if (thatFaction != null) {
Faction thatFaction = getFaction(that); if (thatFaction != null) {
if (thatFaction.isPeaceful() && thatFaction != getFaction(me)) {
return Conf.colorPeaceful;
}