mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-10-01 07:57:31 +02:00
move a import to the right place
This commit is contained in:
parent
79fc7fea6f
commit
71e24ab6a1
@ -1,4 +1,4 @@
|
||||
From 27a82ea70541b4167033f519d91a7117145530cf Mon Sep 17 00:00:00 2001
|
||||
From e2a93fffc50d08cc1d1a97d5c8b713add74feb69 Mon Sep 17 00:00:00 2001
|
||||
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
||||
Date: Wed, 16 Dec 2020 18:06:17 +0800
|
||||
Subject: [PATCH] Close connections & Don't flush if not necessary
|
||||
@ -144,10 +144,18 @@ index 989bfd87..1351d5d5 100644
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
index 9a39f69e..7e407136 100644
|
||||
index 9a39f69e..a54da9c3 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
@@ -102,6 +102,14 @@ public class PipelineUtils
|
||||
@@ -5,6 +5,7 @@ import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
|
||||
import io.netty.buffer.PooledByteBufAllocator;
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.ChannelException;
|
||||
+import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.ChannelInitializer;
|
||||
import io.netty.channel.ChannelOption;
|
||||
import io.netty.channel.EventLoopGroup;
|
||||
@@ -102,6 +103,14 @@ public class PipelineUtils
|
||||
|
||||
BungeeCord.getInstance().getPluginManager().callEvent(connectionInitEvent);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2f459340f4f410e9f98660dd03f4d56900a45e44 Mon Sep 17 00:00:00 2001
|
||||
From 83dd5ab49ce6fcada7fb212a33db9c674fd66e63 Mon Sep 17 00:00:00 2001
|
||||
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
|
||||
Date: Mon, 12 Oct 2020 15:40:53 -0300
|
||||
Subject: [PATCH] FlameCord General Patch
|
||||
@ -1061,10 +1061,10 @@ index d68cc2ce..46e338ca 100644
|
||||
if ( logExceptions )
|
||||
{
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
index 7e407136..84302b32 100644
|
||||
index a54da9c3..84302b32 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
@@ -1,10 +1,14 @@
|
||||
@@ -1,6 +1,9 @@
|
||||
package net.md_5.bungee.netty;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
@ -1074,12 +1074,7 @@ index 7e407136..84302b32 100644
|
||||
import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
|
||||
import io.netty.buffer.PooledByteBufAllocator;
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.ChannelException;
|
||||
+import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.channel.ChannelInitializer;
|
||||
import io.netty.channel.ChannelOption;
|
||||
import io.netty.channel.EventLoopGroup;
|
||||
@@ -60,6 +64,11 @@ public class PipelineUtils
|
||||
@@ -61,6 +64,11 @@ public class PipelineUtils
|
||||
{
|
||||
SocketAddress remoteAddress = ( ch.remoteAddress() == null ) ? ch.parent().localAddress() : ch.remoteAddress();
|
||||
|
||||
@ -1091,7 +1086,7 @@ index 7e407136..84302b32 100644
|
||||
if ( BungeeCord.getInstance().getConnectionThrottle() != null && BungeeCord.getInstance().getConnectionThrottle().throttle( remoteAddress ) )
|
||||
{
|
||||
ch.close();
|
||||
@@ -106,7 +115,9 @@ public class PipelineUtils
|
||||
@@ -107,7 +115,9 @@ public class PipelineUtils
|
||||
// FlameCord - Close on exception caught
|
||||
@Override
|
||||
public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
|
||||
|
Loading…
Reference in New Issue
Block a user