From 29831c03994a59590efde48b20f5ab7d4263ec7e Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Sat, 16 Sep 2017 12:47:11 +0100 Subject: [PATCH] Merge upstream. Fixes #173 --- BungeeCord | 2 +- .../0013-Better-unit-tests-for-Chat-API.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BungeeCord b/BungeeCord index ef326db..3db9fb1 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit ef326dba192fe532dc6509e0975266715da5ccea +Subproject commit 3db9fb1b6942a4ae8b1e9661404533a5f4982ff9 diff --git a/BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch b/BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch index 7eca437..1cb14ed 100644 --- a/BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch +++ b/BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch @@ -1,4 +1,4 @@ -From 8c1a507e084cbf9b0bd023b8a736554406eaa2e5 Mon Sep 17 00:00:00 2001 +From f89cb687f56c14d7d49a0bd8bfbb1a62fbcbbadf Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 17:36:31 -0600 Subject: [PATCH] Better unit tests for Chat API @@ -44,10 +44,10 @@ index 0837c672..7d1ee8e7 100644 + } } diff --git a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java -index c844dab5..8952cbf8 100644 +index 3d9396d3..c1afa6da 100644 --- a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java +++ b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java -@@ -140,6 +140,26 @@ public class ComponentsTest +@@ -149,6 +149,26 @@ public class ComponentsTest Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent ); } @@ -75,5 +75,5 @@ index c844dab5..8952cbf8 100644 public void testLoopSimple() { -- -2.13.4 +2.14.1