Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-07 16:57:42 +01:00
Code Issues Projects Releases Wiki Activity

Use utility method for team-join display. Fixes BUKKIT-3997

Browse Source 
The method to make a string from a collection of strings already exists
and should be used when adding multiple players to a team.

By: Wesley Wolfe <weswolf@aol.com>
This commit is contained in:
Bukkit/Spigot 2013-04-05 12:40:03 -05:00
parent 2436d2b3f8
commit 0716e7a635
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
paper-api/src/main/java/org/bukkit/FireworkEffect.java
View File

@ -59,7 +59,7 @@ public final class FireworkEffect implements ConfigurationSerializable {
public static final class Builder {
boolean flicker = false;
boolean trail = false;
ImmutableList.Builder<Color> colors = ImmutableList.builder();
final ImmutableList.Builder<Color> colors = ImmutableList.builder();
ImmutableList.Builder<Color> fadeColors = null;
Type type = Type.BALL;
@ -130,10 +130,6 @@ public final class FireworkEffect implements ConfigurationSerializable {
public Builder withColor(Color color) throws IllegalArgumentException {
Validate.notNull(color, "Cannot have null color");
if (colors == null) {
colors = ImmutableList.builder();
}
colors.add(color);
return this;
@ -154,10 +150,6 @@ public final class FireworkEffect implements ConfigurationSerializable {
}
ImmutableList.Builder<Color> list = this.colors;
if (list == null) {
list = this.colors = ImmutableList.builder();
}
for (Color color : colors) {
Validate.notNull(color, "Color cannot be null");
list.add(color);
@ -178,10 +170,6 @@ public final class FireworkEffect implements ConfigurationSerializable {
Validate.notNull(colors, "Cannot have null colors");
ImmutableList.Builder<Color> list = this.colors;
if (list == null) {
list = this.colors = ImmutableList.builder();
}
for (Object color : colors) {
if (!(color instanceof Color)) {
throw new IllegalArgumentException(color + " is not a Color in " + colors);

12
paper-api/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java
View File

@ -382,17 +382,7 @@ public class ScoreboardCommand extends VanillaCommand {
addedPlayers.add(offlinePlayer.getName());
}
}
String[] playerArray = addedPlayers.toArray(new String[0]);
StringBuilder builder = new StringBuilder();
for (int x = 0; x < playerArray.length; x++) {
if (x == playerArray.length - 1) {
builder.append(" and ");
} else if (x > 0) {
builder.append(", ");
}
builder.append(playerArray[x]);
}
sender.sendMessage("Added " + addedPlayers.size() + " player(s) to team " + team.getName() + ": " + builder.toString());
sender.sendMessage("Added " + addedPlayers.size() + " player(s) to team " + team.getName() + ": " + stringCollectionToString(addedPlayers));
}
} else if (args[1].equalsIgnoreCase("leave")) {
if ((sender instanceof Player) ? args.length < 2 : args.length < 3) {