craftinc/craftinc-gates
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed broken list command.

Browse Source
This commit is contained in:
Tobias Ottenweller 2013-02-09 15:37:17 +01:00
parent e9ec81cf04
commit 94619cb90f
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/de/craftinc/gates/commands/CommandList.java
View File

@ -3,7 +3,6 @@ package de.craftinc.gates.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -92,20 +91,6 @@ public class CommandList extends BaseCommand
* great. (tell me if there is a better way!) * great. (tell me if there is a better way!)
*/ */
// list<string>: a list from ids
// Integer: the number of lines neccessary for displaying the corresponding list
HashMap<List<String>, Integer> lines = new HashMap<List<String>, Integer>(27);
for (List<String> currentIds : ids) {
if (currentIds.size() == 0) {
continue;
}
int characters = TextUtil.implode(currentIds, ", ").length();
lines.put(currentIds, characters / 52 + 2);
}
int currentPage = 1; int currentPage = 1;
int currentStartingCharList = 0; int currentStartingCharList = 0;
boolean finishedCurrentIds = true; boolean finishedCurrentIds = true;
@ -128,8 +113,10 @@ public class CommandList extends BaseCommand
Collections.sort(currentIds); Collections.sort(currentIds);
// add ids // add ids
if (lines.get(currentIds) <= linesLeftOnCurrentPage) { // all ids fit on current page int numLinesForCurrentChar = TextUtil.implode(currentIds, ", ").length() / 52 + 2;
linesLeftOnCurrentPage -= lines.get(currentIds);
if (numLinesForCurrentChar <= linesLeftOnCurrentPage) { // all ids fit on current page
linesLeftOnCurrentPage -= numLinesForCurrentChar;
if (currentPage == page) { if (currentPage == page) {
pageMessages.add(TextUtil.implode(currentIds, ", ")); pageMessages.add(TextUtil.implode(currentIds, ", "));
@ -159,7 +146,6 @@ public class CommandList extends BaseCommand
pageMessages.set(pageMessages.size() -2, pageMessages.get(pageMessages.size() -2) + " (more on next page)"); pageMessages.set(pageMessages.size() -2, pageMessages.get(pageMessages.size() -2) + " (more on next page)");
} }
lines.put(currentIds, TextUtil.implode(currentIds, ", ").length() / 52 + 2);
linesLeftOnCurrentPage -= stringToPutOnCurrentPage.length() / 52 + 2; linesLeftOnCurrentPage -= stringToPutOnCurrentPage.length() / 52 + 2;
finishedCurrentIds = false; finishedCurrentIds = false;