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

Only changes enough to make everything work

Browse Source
This commit is contained in:
Kristian Knarvik
2023-04-01 14:52:14 +02:00
parent bb0be8a3f0
commit b4e7b8ea44
103 changed files with 2003 additions and 2010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/massivecraft/factions/comparator/ComparatorFactionList.java
View File

@@ -38,27 +38,27 @@ public class ComparatorFactionList extends ComparatorAbstract<Faction> {
@Override
public int compareInner(Faction f1, Faction f2) {
// None a.k.a. Wilderness
if (f1.isNone() && f2.isNone()) {
return 0;
}
if (f1.isNone()) {
return -1;
}
if (f2.isNone()) {
return 1;
}
if (f1.isNone() && f2.isNone()) {
return 0;
}
if (f1.isNone()) {
return -1;
}
if (f2.isNone()) {
return 1;
}
// Players Online
int ret = f2.getMPlayersWhereOnlineTo(this.getWatcher()).size() - f1.getMPlayersWhereOnlineTo(this.getWatcher()).size();
if (ret != 0) {
return ret;
}
if (ret != 0) {
return ret;
}
// Players Total
ret = f2.getMPlayers().size() - f1.getMPlayers().size();
if (ret != 0) {
return ret;
}
if (ret != 0) {
return ret;
}
// Tie by Id
return ComparatorComparable.get().compare(f1.getId(), f2.getId());

14
src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java
View File

@@ -30,13 +30,13 @@ public class ComparatorMPlayerInactivity extends ComparatorAbstract<MPlayer> imp
boolean o1 = m1.isOnline();
boolean o2 = m2.isOnline();
if (o1 && o2) {
return 0;
} else if (o1) {
return -1;
} else if (o2) {
return +1;
}
if (o1 && o2) {
return 0;
} else if (o1) {
return -1;
} else if (o2) {
return +1;
}
// Inactivity Time
long r1 = m1.getLastActivityMillis();

6
src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java
View File

@@ -28,9 +28,9 @@ public class ComparatorMPlayerPower extends ComparatorAbstract<MPlayer> implemen
public int compareInner(MPlayer m1, MPlayer m2) {
// Power
int ret = m1.getPowerRounded() - m2.getPowerRounded();
if (ret != 0) {
return ret;
}
if (ret != 0) {
return ret;
}
// MaxPower
return m1.getPowerMaxRounded() - m2.getPowerMaxRounded();

6
src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java
View File

@@ -28,9 +28,9 @@ public class ComparatorMPlayerRole extends ComparatorAbstract<MPlayer> implement
@Override
public int compareInner(MPlayer m1, MPlayer m2) {
// Rank
if (m1.getFaction() != m2.getFaction()) {
throw new IllegalArgumentException("Noncomparable players");
}
if (m1.getFaction() != m2.getFaction()) {
throw new IllegalArgumentException("Noncomparable players");
}
Rank r1 = m1.getRank();
Rank r2 = m2.getRank();
return r2.getPriority() - r1.getPriority();