mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
45 lines
3.3 KiB
Diff
45 lines
3.3 KiB
Diff
--- ../src-base/minecraft/net/minecraft/network/NetworkSystem.java
|
|
+++ ../src-work/minecraft/net/minecraft/network/NetworkSystem.java
|
|
@@ -49,21 +49,21 @@
|
|
{
|
|
protected NioEventLoopGroup func_179280_b()
|
|
{
|
|
- return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build());
|
|
+ return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).setThreadFactory(net.minecraftforge.fml.common.thread.SidedThreadGroups.SERVER).build());
|
|
}
|
|
};
|
|
public static final LazyLoadBase<EpollEventLoopGroup> field_181141_b = new LazyLoadBase<EpollEventLoopGroup>()
|
|
{
|
|
protected EpollEventLoopGroup func_179280_b()
|
|
{
|
|
- return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).build());
|
|
+ return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).setThreadFactory(net.minecraftforge.fml.common.thread.SidedThreadGroups.SERVER).build());
|
|
}
|
|
};
|
|
public static final LazyLoadBase<LocalEventLoopGroup> field_180232_b = new LazyLoadBase<LocalEventLoopGroup>()
|
|
{
|
|
protected LocalEventLoopGroup func_179280_b()
|
|
{
|
|
- return new LocalEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Server IO #%d").setDaemon(true).build());
|
|
+ return new LocalEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Server IO #%d").setDaemon(true).setThreadFactory(net.minecraftforge.fml.common.thread.SidedThreadGroups.CLIENT).build());
|
|
}
|
|
};
|
|
private final MinecraftServer field_151273_d;
|
|
@@ -79,6 +79,7 @@
|
|
|
|
public void func_151265_a(InetAddress p_151265_1_, int p_151265_2_) throws IOException
|
|
{
|
|
+ if (p_151265_1_ instanceof java.net.Inet6Address) System.setProperty("java.net.preferIPv4Stack", "false");
|
|
synchronized (this.field_151274_e)
|
|
{
|
|
Class <? extends ServerSocketChannel > oclass;
|
|
@@ -110,7 +111,7 @@
|
|
;
|
|
}
|
|
|
|
- p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyPingHandler(NetworkSystem.this)).addLast("splitter", new NettyVarint21FrameDecoder()).addLast("decoder", new NettyPacketDecoder(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new NettyVarint21FrameEncoder()).addLast("encoder", new NettyPacketEncoder(EnumPacketDirection.CLIENTBOUND));
|
|
+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new LegacyPingHandler(NetworkSystem.this)).addLast("splitter", new NettyVarint21FrameDecoder()).addLast("decoder", new NettyPacketDecoder(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new NettyVarint21FrameEncoder()).addLast("encoder", new NettyPacketEncoder(EnumPacketDirection.CLIENTBOUND));
|
|
NetworkManager networkmanager = new NetworkManager(EnumPacketDirection.SERVERBOUND);
|
|
NetworkSystem.this.field_151272_f.add(networkmanager);
|
|
p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);
|