Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-16 07:15:14 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream

Browse Source 
upstream finnaly caught up on those netty versions :D
This commit is contained in:
Jamie Mansfield 2016-08-30 18:30:38 +01:00
parent 80bed7979d
commit 1d27a880c3
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 5c809c24990ec06ecdb0ee6550d4d10595ed9323
Subproject commit 0581e49d49aa3622b1fea1623eb512ab95989e41

12
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 04d38c86924ae8ef7cd45e28a1c095fadf27fa8a Mon Sep 17 00:00:00 2001
From 7b221b9a50f4a8159528da72d644f103cfb01bac Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700
Subject: [PATCH] POM Changes
@ -492,7 +492,7 @@ index a3bd632..a2b422c 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index de51d88..3319e60 100644
index ad09889..732c0d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,18 +9,18 @@
@ -573,7 +573,7 @@ index de51d88..3319e60 100644
+
<properties>
<build.number>unknown</build.number>
<netty.version>4.0.40.Final</netty.version>
<netty.version>4.1.5.Final</netty.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Require Java 8 -->
@ -710,7 +710,7 @@ index bac4690..7a74143 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 55bba90..f7277d6 100644
index 515f2ee..0747614 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -737,7 +737,7 @@ index 55bba90..f7277d6 100644
<description>Proxy component of the Elastic Portal Suite</description>
<dependencies>
@@ -33,32 +33,32 @@
@@ -39,32 +39,32 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -822,5 +822,5 @@ index 8df9b12..1d76633 100644
<scope>compile</scope>
</dependency>
--
2.8.2
2.7.4

27
BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch → BungeeCord-Patches/0008-Improve-Netty-update.patch
View File

@ -1,24 +1,13 @@
From f85163140995e0bdf5992b0c1993a01ce63aa571 Mon Sep 17 00:00:00 2001
From 649eacf548110657a7617fd4b6ca89821300a065 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Upgrade to netty 4.1
Subject: [PATCH] Improve Netty update
ORIGINAL PATCH - Upgrade to netty 4.1
Don't access a ByteBuf's underlying array with ByteBuf.array()
- ByteBuf.array() returns the underlying array storage, and does *not* return a view of the buffer as an array
diff --git a/pom.xml b/pom.xml
index 3319e60..858d367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<properties>
<build.number>unknown</build.number>
- <netty.version>4.0.40.Final</netty.version>
+ <netty.version>4.1.4.Final</netty.version>
<!-- Require Java 8 -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 7a74143..58e107e 100644
--- a/protocol/pom.xml
@ -100,16 +89,16 @@ index 288d602..c7e75bf 100644
// changes in the packet are ignored so we need to send it manually
con.unsafe().sendPacket( pluginMessage );
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 621a06c..0ec3f81 100644
index a274dde..0ec3f81 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
@@ -41,9 +41,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
public class PipelineUtils
{
- public static final AttributeKey<ListenerInfo> LISTENER = new AttributeKey<>( "ListerInfo" );
- public static final AttributeKey<UserConnection> USER = new AttributeKey<>( "User" );
- public static final AttributeKey<BungeeServerInfo> TARGET = new AttributeKey<>( "Target" );
- public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.valueOf( "ListerInfo" );
- public static final AttributeKey<UserConnection> USER = AttributeKey.valueOf( "User" );
- public static final AttributeKey<BungeeServerInfo> TARGET = AttributeKey.valueOf( "Target" );
+ public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.newInstance("ListerInfo");
+ public static final AttributeKey<UserConnection> USER = AttributeKey.newInstance("User");
+ public static final AttributeKey<BungeeServerInfo> TARGET = AttributeKey.newInstance("Target");