2020-01-06 20:43:23 +01:00
|
|
|
From fe117d6dea1360ea75662d587efcd1725de0921f Mon Sep 17 00:00:00 2001
|
2019-03-30 17:09:06 +01:00
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
Date: Sat, 30 Mar 2019 15:11:11 +0000
|
|
|
|
Subject: [PATCH] Fix upstream javadocs
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
2020-01-06 20:43:23 +01:00
|
|
|
index 217cd6a3..9f8f4740 100644
|
2019-03-30 17:09:06 +01:00
|
|
|
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
|
|
|
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
2020-01-06 20:43:23 +01:00
|
|
|
@@ -17,27 +17,25 @@ public interface ProxyConfig
|
2019-03-30 17:09:06 +01:00
|
|
|
/**
|
|
|
|
* Time before users are disconnected due to no network activity.
|
2020-01-06 20:43:23 +01:00
|
|
|
*
|
|
|
|
- * @return timeout
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return the time before users are disconnected due to no network activity.
|
|
|
|
*/
|
|
|
|
int getTimeout();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* UUID used for metrics.
|
2020-01-06 20:43:23 +01:00
|
|
|
- *
|
|
|
|
- * @return uuid
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return the UUID used for metrics
|
|
|
|
*/
|
|
|
|
String getUuid();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Set of all listeners.
|
2020-01-06 20:43:23 +01:00
|
|
|
- *
|
|
|
|
- * @return listeners
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return a set of all listeners
|
|
|
|
*/
|
|
|
|
Collection<ListenerInfo> getListeners();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Set of all servers.
|
2020-01-06 20:43:23 +01:00
|
|
|
- * @return servers
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return a map of registered servers
|
|
|
|
* @deprecated The returned map may be modified concurrently by the proxy.
|
|
|
|
* The safe alternative is {@link #getServersCopy()}.
|
|
|
|
*/
|
2020-01-06 20:43:23 +01:00
|
|
|
@@ -129,14 +127,14 @@ public interface ProxyConfig
|
2019-03-30 17:09:06 +01:00
|
|
|
/**
|
2020-01-06 20:43:23 +01:00
|
|
|
* Does the server authenticate with Mojang.
|
|
|
|
*
|
|
|
|
- * @return online mode
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return if the server authenticates to mojang
|
|
|
|
*/
|
|
|
|
boolean isOnlineMode();
|
|
|
|
|
|
|
|
/**
|
2020-01-06 20:43:23 +01:00
|
|
|
* Whether proxy commands are logged to the proxy log.
|
|
|
|
*
|
|
|
|
- * @return log commands
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return should the proxy log commands
|
|
|
|
*/
|
|
|
|
boolean isLogCommands();
|
|
|
|
|
2020-01-06 20:43:23 +01:00
|
|
|
@@ -150,22 +148,22 @@ public interface ProxyConfig
|
2019-03-30 17:09:06 +01:00
|
|
|
/**
|
|
|
|
* A collection of disabled commands.
|
2020-01-06 20:43:23 +01:00
|
|
|
*
|
|
|
|
- * @return disabled commands
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return a collection of disabled commands
|
|
|
|
*/
|
|
|
|
Collection<String> getDisabledCommands();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The connection throttle delay.
|
2020-01-06 20:43:23 +01:00
|
|
|
*
|
|
|
|
- * @return throttle
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return the connection throttle delay
|
|
|
|
*/
|
|
|
|
@Deprecated
|
|
|
|
int getThrottle();
|
|
|
|
|
|
|
|
/**
|
|
|
|
- * Whether the proxy will parse IPs with spigot or not
|
|
|
|
+ * Whether the proxy will forward the players information (UUID, IP)
|
2020-01-06 20:43:23 +01:00
|
|
|
*
|
|
|
|
- * @return ip forward
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return should we forward player information
|
|
|
|
*/
|
|
|
|
@Deprecated
|
|
|
|
boolean isIpForward();
|
2020-01-06 20:43:23 +01:00
|
|
|
@@ -173,7 +171,7 @@ public interface ProxyConfig
|
2019-03-30 17:09:06 +01:00
|
|
|
/**
|
|
|
|
* The encoded favicon.
|
|
|
|
*
|
2020-01-06 20:43:23 +01:00
|
|
|
- * @return favicon
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return the encoded favicon
|
|
|
|
* @deprecated Use #getFaviconObject instead.
|
|
|
|
*/
|
|
|
|
@Deprecated
|
2020-01-06 20:43:23 +01:00
|
|
|
@@ -182,7 +180,7 @@ public interface ProxyConfig
|
2019-03-30 17:09:06 +01:00
|
|
|
/**
|
|
|
|
* The favicon used for the server ping list.
|
2020-01-06 20:43:23 +01:00
|
|
|
*
|
|
|
|
- * @return favicon
|
2019-03-30 17:09:06 +01:00
|
|
|
+ * @return the favicon used for the server ping list
|
|
|
|
*/
|
|
|
|
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
|
2020-01-06 20:43:23 +01:00
|
|
|
index 32732703..46d70184 100644
|
2019-03-30 17:09:06 +01:00
|
|
|
--- 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
|
|
|
|
*
|
2020-01-06 20:43:23 +01:00
|
|
|
* @param plugin owning plugin
|
2019-03-30 17:09:06 +01:00
|
|
|
* @return the underlying executor service or compatible wrapper
|
|
|
|
--
|
2020-01-06 20:43:23 +01:00
|
|
|
2.24.1
|
2019-03-30 17:09:06 +01:00
|
|
|
|