From 2a4f222c3eeddeabbde5077e0f074bdcc2eac06e Mon Sep 17 00:00:00 2001
From: Peridot <peridot491@protonmail.com>
Date: Mon, 3 Oct 2022 03:12:39 +0200
Subject: [PATCH] Don't use google commons in Util#requiresNettyChannelMetadata
(#2907)
* Improve Util#requiresNettyChannelMetadata
* Fix comment
* Don't use google commons in Util#requiresNettyChannelMetadata
---
.../main/java/net/citizensnpcs/util/Util.java | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java
index c4a14ddff..5c8314afc 100644
--- a/main/src/main/java/net/citizensnpcs/util/Util.java
+++ b/main/src/main/java/net/citizensnpcs/util/Util.java
@@ -7,6 +7,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.function.Function;
+import java.util.stream.StreamSupport;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -345,20 +346,18 @@ public class Util {
if (version == null)
return REQUIRES_CHANNEL_METADATA = false;
try {
- Integer[] parts = Iterables.toArray(
- Iterables.transform(Splitter.on('.').split(version.artifactVersion()), string -> {
- // Newer versions of netty use suffix (like .Final) that can't be parsed to Integer
- try {
- return Integer.parseInt(string);
- } catch (NumberFormatException e) {
- return -1;
- }
- }),
- int.class);
+ Integer[] parts = StreamSupport.stream(Splitter.on('.').split(version.artifactVersion()).spliterator(), false).map(string -> {
+ // Newer versions of netty use suffix (like .Final) that can't be parsed to Integer
+ try {
+ return Integer.parseInt(string);
+ } catch (NumberFormatException e) {
+ return -1;
+ }
+ }).toArray(Integer[]::new);
int major = parts[0];
int minor = parts[1];
int patch = parts[2];
- return REQUIRES_CHANNEL_METADATA = major >= 5 || major == 4 && minor > 1 || patch >= 64;
+ return REQUIRES_CHANNEL_METADATA = major >= 5 || major == 4 && (minor > 1 || patch >= 64);
} catch (Throwable t) {
t.printStackTrace();
return REQUIRES_CHANNEL_METADATA = true;