Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 85ea4c16 Remove redundant scheduled close, already channel closed by future. 22d2cd33 #2747: Fix TranslatableComponent.deserialize()
This commit is contained in:
parent
3a793b886c
commit
d598d51135
|
@ -1 +1 @@
|
|||
Subproject commit d8c222ae798cc72c9e368802cfe0676ba4e42a65
|
||||
Subproject commit 85ea4c165b0a4de63e538b4b70abaa3734333e51
|
|
@ -1,4 +1,4 @@
|
|||
From bc753096ca1c59125c7338f5276942018e3325c2 Mon Sep 17 00:00:00 2001
|
||||
From 4d2ab0a0763157aa7018b8db62964ad865455d0a Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Thu, 19 May 2016 17:36:31 -0600
|
||||
Subject: [PATCH] Better unit tests for Chat API
|
||||
|
@ -36,12 +36,12 @@ index df38e297..563b6911 100644
|
|||
public void testLoopSimple()
|
||||
{
|
||||
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
|
||||
index 7e63488c..e85c55b7 100644
|
||||
index 9e37eed0..a25a01b8 100644
|
||||
--- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
|
||||
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
|
||||
@@ -13,4 +13,12 @@ public class TranslatableComponentTest
|
||||
Assert.assertEquals( "Test string with 2 placeholders: aoeu", testComponent.toPlainText() );
|
||||
Assert.assertEquals( "§fTest string with §f2§f placeholders: §faoeu", testComponent.toLegacyText() );
|
||||
@@ -25,4 +25,12 @@ public class TranslatableComponentTest
|
||||
Assert.assertEquals( "Test string with a placeholder", TextComponent.toPlainText( baseComponents ) );
|
||||
Assert.assertEquals( "§fTest string with §fa§f placeholder", TextComponent.toLegacyText( baseComponents ) );
|
||||
}
|
||||
+
|
||||
+ @Test
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c41d68728fd137c1af79835b0782bf358ef2eed1 Mon Sep 17 00:00:00 2001
|
||||
From 3e59f82613e4f183eebc4717f1fe73d5049a9d27 Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@techcable.net>
|
||||
Date: Fri, 18 Mar 2016 10:53:24 -0700
|
||||
Subject: [PATCH] Better Decompression Sanity
|
||||
|
@ -45,10 +45,10 @@ index 21b3ea2b..37fe6ac7 100644
|
|||
out.add( decompressed );
|
||||
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
|
||||
index 71df1fd5..4882b8ed 100644
|
||||
index 0ef21887..30ccfa9f 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
|
||||
@@ -146,7 +146,7 @@ public class ChannelWrapper
|
||||
@@ -138,7 +138,7 @@ public class ChannelWrapper
|
||||
|
||||
if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold != -1 )
|
||||
{
|
||||
|
@ -58,5 +58,5 @@ index 71df1fd5..4882b8ed 100644
|
|||
if ( compressionThreshold == -1 )
|
||||
{
|
||||
--
|
||||
2.19.1
|
||||
2.24.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue