Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-01 06:33:39 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-02-07 22:39:22 +00:00
parent 91d537c7cc
commit 32a7625f4f
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 950d504bd87fe8401190dd7d8e192a266763f916 Subproject commit 01f44483df8623f30affe3c972f988038a501fa6

8
BungeeCord-Patches/0026-Better-Decompression-Sanity.patch
View File

@ -1,4 +1,4 @@
From f56b491d0446e50c02dfc076242a1e9133f7bd88 Mon Sep 17 00:00:00 2001 From ef4ae5cdca9db80a655c5f2d98e516efac9a7524 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700 Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity Subject: [PATCH] Better Decompression Sanity
@ -45,10 +45,10 @@ index 21b3ea2b..37fe6ac7 100644
out.add( decompressed ); out.add( decompressed );
decompressed = null; decompressed = null;
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
index 28a4f176..0107ac03 100644 index 9050534a..a82deb4b 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java --- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -136,7 +136,7 @@ public class ChannelWrapper @@ -141,7 +141,7 @@ public class ChannelWrapper
if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold != -1 ) if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold != -1 )
{ {
@ -58,5 +58,5 @@ index 28a4f176..0107ac03 100644
if ( compressionThreshold == -1 ) if ( compressionThreshold == -1 )
{ {
-- --
2.11.0 2.11.1