From 6572b9c31a557c7260d3374e1adc2b31a29e3b30 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 22 Jul 2021 09:54:57 +1000 Subject: [PATCH] SPIGOT-6641: Use varargs in sendMessage --- .../bukkit/craftbukkit/command/CraftBlockCommandSender.java | 2 +- .../bukkit/craftbukkit/command/CraftConsoleCommandSender.java | 2 +- .../craftbukkit/command/CraftRemoteConsoleCommandSender.java | 2 +- .../craftbukkit/command/ProxiedNativeCommandSender.java | 4 ++-- .../org/bukkit/craftbukkit/command/ServerCommandSender.java | 2 +- src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java index 03b35104d..8d857e7d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java @@ -35,7 +35,7 @@ public class CraftBlockCommandSender extends ServerCommandSender implements Bloc } @Override - public void sendMessage(String[] messages) { + public void sendMessage(String... messages) { for (String message : messages) { sendMessage(message); } diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java index 089fe4a34..f6f0aeec3 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java @@ -35,7 +35,7 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co } @Override - public void sendMessage(String[] messages) { + public void sendMessage(String... messages) { for (String message : messages) { sendMessage(message); } diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java index c77e0a3ff..83be6ef8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java @@ -19,7 +19,7 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme } @Override - public void sendMessage(String[] messages) { + public void sendMessage(String... messages) { for (String message : messages) { sendMessage(message); } diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java index 1beca7819..f9d3b5a49 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java @@ -43,7 +43,7 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender { } @Override - public void sendMessage(String[] messages) { + public void sendMessage(String... messages) { getCaller().sendMessage(messages); } @@ -53,7 +53,7 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender { } @Override - public void sendMessage(UUID sender, String[] messages) { + public void sendMessage(UUID sender, String... messages) { getCaller().sendMessage(sender, messages); } diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java index d97716027..7fa2588b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java @@ -87,7 +87,7 @@ public abstract class ServerCommandSender implements CommandSender { } @Override - public void sendMessage(UUID uuid, String[] messages) { + public void sendMessage(UUID uuid, String... messages) { this.sendMessage(messages); // ServerCommandSenders have no use for senders } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 7c1a22d63..6fc198d70 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -845,7 +845,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } @Override - public void sendMessage(String[] messages) { + public void sendMessage(String... messages) { } @@ -855,7 +855,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } @Override - public void sendMessage(UUID sender, String[] messages) { + public void sendMessage(UUID sender, String... messages) { this.sendMessage(messages); // Most entities don't know about senders }