SteamWar/Velocity
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Velocity #2

Merged
Chaoscaot merged 45 commits from update into master 2025-06-26 23:11:03 +02:00
Conversation 0 Commits 45 Files Changed 50 +710 -440
39 changed files with 710 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ad1f3b215 - Show all commits

6
proxy/src/main/java/com/velocitypowered/proxy/network/ConnectionManager.java
View File

@ -29,6 +29,7 @@ import com.velocitypowered.proxy.network.netty.SeparatePoolInetNameResolver;
import com.velocitypowered.proxy.protocol.netty.GameSpyQueryHandler;
import io.netty.bootstrap.Bootstrap;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
@ -116,6 +117,11 @@ public final class ConnectionManager {
bootstrap.group(this.bossGroup, this.workerGroup);
}
// Restore allocator used before Netty 4.2 due to oom issues with the adaptive allocator
if (System.getProperty("io.netty.allocator.type") == null) {
bootstrap.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
}
final int binds = server.getConfiguration().isEnableReusePort()
? ((MultithreadEventExecutorGroup) this.workerGroup).executorCount() : 1;