Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-27 17:52:03 +01:00
Code Issues Projects Releases Wiki Activity

Plugins seem to mess with netty versioning so just always create metadata

Browse Source
This commit is contained in:
fullwall 2022-12-14 23:31:25 +08:00
parent ab458f4de9
commit 8f29e6ff73
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/util/EmptyChannel.java
View File

@ -9,7 +9,6 @@ import io.netty.channel.ChannelMetadata;
import io.netty.channel.ChannelOutboundBuffer; import io.netty.channel.ChannelOutboundBuffer;
import io.netty.channel.DefaultChannelConfig; import io.netty.channel.DefaultChannelConfig;
import io.netty.channel.EventLoop; import io.netty.channel.EventLoop;
import net.citizensnpcs.util.Util;
public class EmptyChannel extends AbstractChannel { public class EmptyChannel extends AbstractChannel {
private final ChannelConfig config = new DefaultChannelConfig(this); private final ChannelConfig config = new DefaultChannelConfig(this);
@ -66,7 +65,7 @@ public class EmptyChannel extends AbstractChannel {
@Override @Override
public ChannelMetadata metadata() { public ChannelMetadata metadata() {
return Util.requiresNettyChannelMetadata() ? new ChannelMetadata(true) : null; return new ChannelMetadata(true);
} }
@Override @Override

32
main/src/main/java/net/citizensnpcs/util/Util.java
View File

@ -8,7 +8,6 @@ import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.StreamSupport;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -32,7 +31,6 @@ import com.google.common.base.Splitter;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import io.netty.util.Version;
import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.event.NPCCollisionEvent; import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
@ -342,36 +340,6 @@ public class Util {
TWO_DIGIT_DECIMAL.format(to.getYaw()), TWO_DIGIT_DECIMAL.format(to.getPitch())); TWO_DIGIT_DECIMAL.format(to.getYaw()), TWO_DIGIT_DECIMAL.format(to.getPitch()));
} }
public static boolean requiresNettyChannelMetadata() {
if (REQUIRES_CHANNEL_METADATA != null)
return REQUIRES_CHANNEL_METADATA;
Version version = Version.identify().get("netty-common");
if (version == null) {
version = Version.identify().get("netty-all");
}
if (version == null)
return REQUIRES_CHANNEL_METADATA = true;
try {
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 >= 25);
} catch (Throwable t) {
t.printStackTrace();
return REQUIRES_CHANNEL_METADATA = true;
}
}
public static void runCommand(NPC npc, Player clicker, String command, boolean op, boolean player) { public static void runCommand(NPC npc, Player clicker, String command, boolean op, boolean player) {
List<String> split = Splitter.on(' ').omitEmptyStrings().trimResults().limit(2).splitToList(command); List<String> split = Splitter.on(' ').omitEmptyStrings().trimResults().limit(2).splitToList(command);
String bungeeServer = split.size() == 2 && split.get(0).equalsIgnoreCase("server") ? split.get(1) : null; String bungeeServer = split.size() == 2 && split.get(0).equalsIgnoreCase("server") ? split.get(1) : null;