tale/ProjectAres
1
0
Fork 0
mirror of https://github.com/OvercastNetwork/ProjectAres.git synced 2025-04-11 22:56:08 +02:00
Code Issues Releases Wiki Activity

Fix tab list missing row in ffa

Browse Source
This commit is contained in:
Pablete1234 2017-02-01 03:53:44 +01:00
parent 6aeae63e72
commit 0d39d948be
No known key found for this signature in database
GPG Key ID: DAFF9A337EF9A5FA
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PGM/src/main/java/tc/oc/pgm/tablist/MatchTabView.java
View File

@ -10,6 +10,7 @@ import javax.annotation.Nullable;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -122,15 +123,18 @@ public class MatchTabView extends TabView implements Listener {
} else { } else {
List<MatchPlayer> participants = players.get(Party.Type.Participating); List<MatchPlayer> participants = players.get(Party.Type.Participating);
// Minimum rows required by participating players // Minimum rows required by participating players
int participantRows = Math.min(availableRows - observerRows, 1 + Numbers.divideRoundingUp(participants.size(), this.getWidth())); int participantRows = Math.min(availableRows - addRowIfAny(observerRows), 1 + Numbers.divideRoundingUp(participants.size(), this.getWidth()));
// Expand observer rows until all observers are showing // Expand observer rows until all observers are showing
observerRows = Math.min(availableRows - participantRows, 1 + Numbers.divideRoundingUp(observingPlayers, this.getWidth())); observerRows = Math.min(availableRows - participantRows, Numbers.divideRoundingUp(observingPlayers, this.getWidth()));
// Expand participant rows to fill whatever if left // Expand participant rows to fill whatever if left
participantRows = availableRows - observerRows; participantRows = availableRows - addRowIfAny(observerRows);
this.renderTeam(participants, getManager().getFreeForAllEntry(match), true, 0, this.getWidth(), 0, participantRows); this.renderTeam(participants, getManager().getFreeForAllEntry(match), true, 0, this.getWidth(), 0, participantRows);
// Render 1 line space before observers
if (observerRows > 0) renderBlank(availableRows - observerRows + 1);
} }
if(observerRows > 0) { if(observerRows > 0) {
@ -142,6 +146,11 @@ public class MatchTabView extends TabView implements Listener {
super.render(); super.render();
} }
/* --- Render utils --- */ /* --- Render utils --- */
// Add a blank row, but only if there is any obs to show
private int addRowIfAny(int rows) {
return rows <= 0 ? 0 : rows + 1;
}
// Render a blank row at y // Render a blank row at y
private void renderBlank(int y) { private void renderBlank(int y) {
renderBlank(0, this.getWidth(), y, y + 1); renderBlank(0, this.getWidth(), y, y + 1);