Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-27 22:17:57 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Shane Freeder 2018-03-14 14:55:00 +00:00
parent 5afcff9279
commit 804cb0dd79
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
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 7ee0b6dccb4d5269f239321f6d1b6b6c36dc16c3
Subproject commit d7eef6ff2ec249581fb3f2e0093a5c3a54d818a4

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

@ -1,14 +1,14 @@
From 3df40a2343f067b703cb9d695c23f48c53750b1e Mon Sep 17 00:00:00 2001
From b12d17dd55382be82a38a60b73be09ba18c3ce23 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
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 ce56c7f7..1946b318 100644
index 5bf1bf8e..16bc9730 100644
--- 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
@@ -180,6 +180,26 @@ public class ComponentsTest
@@ -200,6 +200,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
}
@ -53,5 +53,5 @@ index 0837c672..38147e2a 100644
+ }
}
--
2.16.1
2.16.2