From 0b256d15b26feb7707bb8590e235c2f997626258 Mon Sep 17 00:00:00 2001 From: terrarier2111 <58695553+terrarier2111@users.noreply.github.com> Date: Sun, 15 Nov 2020 21:15:42 +0100 Subject: [PATCH 1/5] Created a local variable for ProxiedPlayers --- bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java b/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java index e077bc26e..99214132c 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java +++ b/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java @@ -126,9 +126,10 @@ public class BungeePlugin extends Plugin implements ViaPlatform, @Override public ViaCommandSender[] getOnlinePlayers() { - ViaCommandSender[] array = new ViaCommandSender[getProxy().getPlayers().size()]; + Collection players = getProxy().getPlayers(); + ViaCommandSender[] array = new ViaCommandSender[players.size()]; int i = 0; - for (ProxiedPlayer player : getProxy().getPlayers()) { + for (ProxiedPlayer player : players) { array[i++] = new BungeeCommandSender(player); } return array; From 6a12f8139c5d0970ec34b51f7c173419717701d2 Mon Sep 17 00:00:00 2001 From: terrarier2111 <58695553+terrarier2111@users.noreply.github.com> Date: Sat, 21 Nov 2020 19:26:10 +0100 Subject: [PATCH 2/5] Added missing import --- bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java b/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java index 99214132c..bf7f1ff01 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java +++ b/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java @@ -28,6 +28,7 @@ import us.myles.ViaVersion.util.GsonUtil; import java.util.ArrayList; import java.util.Collections; +import java.util.Collection; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; From e22975cec450b1af055559449a56064d78cdbab3 Mon Sep 17 00:00:00 2001 From: Mat Date: Fri, 11 Dec 2020 03:08:34 +0200 Subject: [PATCH 3/5] Add missing length check in 1.13 -> 1.12.2 stats code --- .../protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java index 18e687517..b02f3136f 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java @@ -210,7 +210,7 @@ public class Protocol1_13To1_12_2 extends Protocol 1.12.2 statistic mapping for " + name); } - } else { + } else if (split.length > 2) { String category = split[1]; //TODO convert string ids (blocks, items, entities) switch (category) { From 6c440513ba0bfe4d232b6ce187bb7e8a8a440421 Mon Sep 17 00:00:00 2001 From: Myles Date: Sat, 12 Dec 2020 13:07:59 +0000 Subject: [PATCH 4/5] 3.2.1 --- bukkit-legacy/pom.xml | 2 +- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- fabric/pom.xml | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml index 8bf6a88cb..1d8eb85c9 100644 --- a/bukkit-legacy/pom.xml +++ b/bukkit-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 5874f1272..e43af8058 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 352e4765f..965229e1d 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 06738ba3e..ffb6f5f77 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/fabric/pom.xml b/fabric/pom.xml index 0e2cf8d84..59c1ad262 100644 --- a/fabric/pom.xml +++ b/fabric/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index 836dc12bd..3b36c27a1 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 23241ed87..c1ac626bb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 3.2.1-SNAPSHOT + 3.2.1 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index fc58840c6..3e3fe3629 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index e752ac149..9683ea26f 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index b2062e656..8ccdc07ba 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1-SNAPSHOT + 3.2.1 4.0.0 From c0fb81946e751ada0b6f6373ba13b5c1f07a4b1f Mon Sep 17 00:00:00 2001 From: Myles Date: Sat, 12 Dec 2020 13:16:13 +0000 Subject: [PATCH 5/5] Snapshot --- bukkit-legacy/pom.xml | 2 +- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- fabric/pom.xml | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml index 1d8eb85c9..cb2b5977d 100644 --- a/bukkit-legacy/pom.xml +++ b/bukkit-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/bukkit/pom.xml b/bukkit/pom.xml index e43af8058..07e8b0dcd 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 965229e1d..4b07ae90f 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index ffb6f5f77..554e7d3c8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/fabric/pom.xml b/fabric/pom.xml index 59c1ad262..b59997000 100644 --- a/fabric/pom.xml +++ b/fabric/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index 3b36c27a1..a923a5749 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index c1ac626bb..08c70cbba 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 3.2.1 + 3.2.2-SNAPSHOT pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 3e3fe3629..e4fe67957 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 9683ea26f..17e7bb9d3 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 8ccdc07ba..fda10ea51 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.2.1 + 3.2.2-SNAPSHOT 4.0.0