Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-17 02:44:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix plot list top

Browse Source
This commit is contained in:
boy0001 2015-07-18 15:50:25 +10:00
parent fcc5056f8c
commit f833370bd9
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/intellectualcrafters/plot/commands/list.java
View File

@ -202,24 +202,26 @@ public class list extends SubCommand {
public int compare(Plot p1, Plot p2) { public int compare(Plot p1, Plot p2) {
double v1 = 0; double v1 = 0;
double v2 = 0; double v2 = 0;
if (p1.settings.ratings != null && p1.settings.ratings.size() > 0) { int p1s = p1.settings.ratings != null ? p1.settings.ratings.size() : 0;
int p2s = p2.settings.ratings != null ? p2.settings.ratings.size() : 0;
if (p1.settings.ratings != null && p1s > 0) {
for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) { for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
double av = entry.getValue().getAverageRating(); double av = entry.getValue().getAverageRating();
v1 += av * av; v1 += av * av;
} }
v1 /= p1.settings.ratings.size(); v1 /= p1s;
v2 += p2.settings.ratings.size(); v1 += p1s;
} }
if (p2.settings.ratings != null && p2.settings.ratings.size() > 0) { if (p2.settings.ratings != null && p2s > 0) {
for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) { for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
double av = entry.getValue().getAverageRating(); double av = entry.getValue().getAverageRating();
v2 += av * av; v2 += av * av;
} }
v2 /= p2.settings.ratings.size(); v2 /= p2s;
v2 += p2.settings.ratings.size(); v2 += p2s;
} }
if (v2 == v1 && v2 != 0) { if (v2 == v1 && v2 != 0) {
return p2.settings.ratings.size() - p1.settings.ratings.size(); return p2s - p1s;
} }
return (int) Math.signum(v2 - v1); return (int) Math.signum(v2 - v1);
} }

2
src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -327,7 +327,7 @@ public class Plot implements Cloneable {
for (Rating rating : ratings) { for (Rating rating : ratings) {
sum += rating.getAverageRating(); sum += rating.getAverageRating();
} }
return sum / ratings.size(); return (sum / ratings.size());
} }
/** /**