Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bleeding] Correct handling of blank lines in ChatPaginator.

Browse Source
This commit is contained in:
zml2008 2012-03-10 13:40:05 -08:00 committed by EvilSeph
parent 00723dc666
commit 26fbd1228d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bukkit/util/ChatPaginator.java
View File

@ -119,20 +119,22 @@ public class ChatPaginator {
if(line.length() > 0) { // Only add the last line if there is anything to add if(line.length() > 0) { // Only add the last line if there is anything to add
lines.add(line.toString()); lines.add(line.toString());
} }
// Iterate over the wrapped lines, applying the last color from one line to the beginning of the next // Iterate over the wrapped lines, applying the last color from one line to the beginning of the next
if (lines.get(0).charAt(0) != ChatColor.COLOR_CHAR) { if (lines.get(0).length() == 0 || lines.get(0).charAt(0) != ChatColor.COLOR_CHAR) {
lines.set(0, ChatColor.WHITE + lines.get(0)); lines.set(0, ChatColor.WHITE + lines.get(0));
} }
for (int i = 1; i < lines.size(); i++) { for (int i = 1; i < lines.size(); i++) {
String pLine = lines.get(i-1); final String pLine = lines.get(i-1);
final String subLine = lines.get(i);
char color = pLine.charAt(pLine.lastIndexOf(ChatColor.COLOR_CHAR) + 1); char color = pLine.charAt(pLine.lastIndexOf(ChatColor.COLOR_CHAR) + 1);
if (lines.get(i).charAt(0) != ChatColor.COLOR_CHAR) { if (subLine.length() == 0 || subLine.charAt(0) != ChatColor.COLOR_CHAR) {
lines.set(i, ChatColor.getByChar(color) + lines.get(i)); lines.set(i, ChatColor.getByChar(color) + subLine);
} }
} }
return lines.toArray(new String[0]); return lines.toArray(new String[lines.size()]);
} }
public static class ChatPage { public static class ChatPage {