diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java index bc076d1cb..421e5c893 100644 --- a/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java +++ b/bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java @@ -25,8 +25,6 @@ package org.geysermc.geyser.platform.bungeecord; -import io.netty.buffer.AdaptiveByteBufAllocator; -import io.netty.buffer.ByteBufAllocator; import io.netty.channel.Channel; import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.CommandSender; @@ -84,12 +82,9 @@ public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap { public void onGeyserInitialize() { GeyserLocale.init(this); - // TODO remove when this isn't an issue anymore - boolean adaptiveAllocatorUsed = System.getProperty("io.netty.allocator.type") == null && ByteBufAllocator.DEFAULT instanceof AdaptiveByteBufAllocator; - try { List supportedProtocols = ProtocolConstants.SUPPORTED_VERSION_IDS; - if (!supportedProtocols.contains(GameProtocol.getJavaProtocolVersion()) || adaptiveAllocatorUsed) { + if (!supportedProtocols.contains(GameProtocol.getJavaProtocolVersion())) { geyserLogger.error(" / \\"); geyserLogger.error(" / \\"); geyserLogger.error(" / | \\"); diff --git a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java index ea68d354c..42a296c16 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java @@ -89,11 +89,6 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap { ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED); // Can eat performance } - // Restore allocator used before Netty 4.2 due to oom issues with the adaptive allocator - if (System.getProperty("io.netty.allocator.type") == null) { - System.setProperty("io.netty.allocator.type", "pooled"); - } - System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager"); GeyserStandaloneLogger.setupStreams(); diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java index a83a84d2c..76483acdc 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java @@ -36,8 +36,6 @@ import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.proxy.ProxyServer; -import io.netty.buffer.AdaptiveByteBufAllocator; -import io.netty.buffer.ByteBufAllocator; import lombok.Getter; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -93,10 +91,7 @@ public class GeyserVelocityPlugin implements GeyserBootstrap { public void onGeyserInitialize() { GeyserLocale.init(this); - // TODO remove when this isn't an issue anymore - boolean adaptiveAllocatorUsed = System.getProperty("io.netty.allocator.type") == null && ByteBufAllocator.DEFAULT instanceof AdaptiveByteBufAllocator; - - if (!ProtocolVersion.isSupported(GameProtocol.getJavaProtocolVersion()) || adaptiveAllocatorUsed) { + if (!ProtocolVersion.isSupported(GameProtocol.getJavaProtocolVersion())) { geyserLogger.error(" / \\"); geyserLogger.error(" / \\"); geyserLogger.error(" / | \\"); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 71372eac9..d735a65fa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ erosion = "1.1-20240521.000109-3" events = "1.1-SNAPSHOT" jackson = "2.17.0" fastutil = "8.5.15-SNAPSHOT" -netty = "4.2.3.Final" +netty = "4.2.7.Final" guava = "29.0-jre" gson = "2.3.1" # Provided by Spigot 1.8.8 websocket = "1.5.1"