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

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-03-05 21:07:50 +00:00
parent 1932de511c
commit d4bcbb1140
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 74e077e0fb78a178ea9f2c4dfea2e7fdeeab8a8e Subproject commit 7653a5f0f8a19dc4e50175b480cd063c523c3b6b

6
BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
View File

@ -1,14 +1,14 @@
From 857e3805f85d667bd0a28beb0eec81fa41c0a38e Mon Sep 17 00:00:00 2001 From 3df40a2343f067b703cb9d695c23f48c53750b1e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600 Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API Subject: [PATCH] Better unit tests for Chat API
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index 43420f2b..42d724eb 100644 index ce56c7f7..1946b318 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -144,6 +144,26 @@ public class ComponentsTest @@ -180,6 +180,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent ); Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
} }