Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix CCE from last commit

This commit is contained in:
Shane Freeder 2020-02-22 14:22:27 +00:00
parent e19ea6c087
commit 56ab74265e
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BungeeCord-Patches/0050-Fix-upstream-javadocs.patch
View File

@ -1,4 +1,4 @@
From 1f214e0f51add45580c27f75825d1516ff438827 Mon Sep 17 00:00:00 2001
From 0035af0d7779842e4fe63b3601e571f82db9b3c4 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 30 Mar 2019 15:11:11 +0000
Subject: [PATCH] Fix upstream javadocs
@ -103,6 +103,18 @@ index f3bced0a..4a198ee9 100644
*/
Favicon getFaviconObject();
diff --git a/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java b/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
index 32732703..46d70184 100644
--- a/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
+++ b/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
@@ -85,6 +85,7 @@ public interface TaskScheduler
/**
* An executor service which underlies this scheduler.
+ * @param plugin The plugin of which to fetch an executor service for
*
* @param plugin owning plugin
* @return the underlying executor service or compatible wrapper
--
2.23.0.windows.1
2.25.0

8
BungeeCord-Patches/0054-ConnectionInitEvent.patch
View File

@ -1,4 +1,4 @@
From e7304c8179fc7985a420337d51d441f1000794e2 Mon Sep 17 00:00:00 2001
From bedeffb74e8ac3cfd9940c66b68fd3091c349f90 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 2 Dec 2019 11:35:17 +0000
Subject: [PATCH] ConnectionInitEvent
@ -6,7 +6,7 @@ Subject: [PATCH] ConnectionInitEvent
diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/event/ConnectionInitEvent.java b/api/src/main/java/io/github/waterfallmc/waterfall/event/ConnectionInitEvent.java
new file mode 100644
index 00000000..77ff8740
index 00000000..6e79675f
--- /dev/null
+++ b/api/src/main/java/io/github/waterfallmc/waterfall/event/ConnectionInitEvent.java
@@ -0,0 +1,56 @@
@ -28,13 +28,13 @@ index 00000000..77ff8740
+ * efficiently close a connection, useful for connection throttlers, etc
+ */
+@ToString
+public class ConnectionInitEvent extends AsyncEvent<ClientConnectEvent> implements Cancellable {
+public class ConnectionInitEvent extends AsyncEvent<ConnectionInitEvent> implements Cancellable {
+
+ private final SocketAddress remoteAddress;
+ private final ListenerInfo listener;
+ private boolean isCancelled = false;
+
+ public ConnectionInitEvent(SocketAddress remoteAddress, ListenerInfo listener, Callback<ClientConnectEvent> done) {
+ public ConnectionInitEvent(SocketAddress remoteAddress, ListenerInfo listener, Callback<ConnectionInitEvent> done) {
+ super(done);
+ this.remoteAddress = remoteAddress;
+ this.listener = listener;