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

Faction Disband Reason & Auto-Completion

Browse Source 
- Add Faction Disband Reason
- Add Auto-Completion
- Optimization
This commit is contained in:
GenialJerome
2018-12-09 03:13:18 +01:00
parent c58ed305a8
commit 16aa87a16a
32 changed files with 365 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,12 +56,9 @@ public class RelationUtil {
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) {
if (fthat == null || fme == null) {
return Relation.NEUTRAL; // ERROR
}
@@ -99,18 +96,14 @@ public class RelationUtil {
public static ChatColor getColorOfThatToMe(RelationParticipator that, RelationParticipator me) {
Faction thatFaction = getFaction(that);
if (thatFaction != null) {
if (thatFaction.isPeaceful() && thatFaction != getFaction(me)) {
if (thatFaction != null && thatFaction != getFaction(me)) {
if (thatFaction.isPeaceful())
return Conf.colorPeaceful;
}
if (thatFaction.isSafeZone() && thatFaction != getFaction(me)) {
else if (thatFaction.isSafeZone())
return Conf.colorPeaceful;
}
if (thatFaction.isWarZone() && thatFaction != getFaction(me)) {
else if (thatFaction.isWarZone())
return Conf.colorWar;
}
}
return getRelationTo(that, me).getColor();