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

Fix more javadoc issues

Browse Source
This commit is contained in:
Shane Freeder 2019-03-30 17:18:24 +00:00
parent 083479278e
commit 56c18488fe
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 28cd0114e469f193732903fc2e3beb23d3ac898b Mon Sep 17 00:00:00 2001
From fe540697228cf42c513c57d342120e20e80b97a2 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -483,7 +483,7 @@ index 15c0ada2..7073b404 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6cd54c2d..c209363d 100644
index 6cd54c2d..5ee845f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -587,11 +587,11 @@ index 6cd54c2d..c209363d 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -118,24 +142,12 @@
@@ -118,24 +142,13 @@
</execution>
</executions>
</plugin>
+ <!-- OSS Parent 9 uses 2.7, 2.10+ is broken anyway -->
+ <!-- Use latest version of the javadoc plugin, fixes some issues with the javadoc tool on recent JDK builds on macOS at least -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
@ -613,10 +613,11 @@ index 6cd54c2d..c209363d 100644
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
+ <doclint>none</doclint>
</configuration>
</plugin>
</plugins>
@@ -171,4 +183,87 @@
@@ -171,4 +184,87 @@
</plugins>
</pluginManagement>
</build>
@ -649,7 +650,7 @@ index 6cd54c2d..c209363d 100644
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <!--<additionalparam>-Xdoclint:none</additionalparam>-->
+ <doclint>none</doclint>
+ </configuration>
+ <executions>
+ <execution>

11
BungeeCord-Patches/0031-Proxy-query-event.patch
View File

@ -1,4 +1,4 @@
From d2521c4481ccd232d38a9184871cc7adba563ee5 Mon Sep 17 00:00:00 2001
From 8c80ae6e41922c2347dd89527701619e5721a9e3 Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event
@ -6,10 +6,10 @@ Subject: [PATCH] Proxy query event
diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/QueryResult.java b/api/src/main/java/io/github/waterfallmc/waterfall/QueryResult.java
new file mode 100644
index 00000000..1e33cd19
index 00000000..9a262c8a
--- /dev/null
+++ b/api/src/main/java/io/github/waterfallmc/waterfall/QueryResult.java
@@ -0,0 +1,62 @@
@@ -0,0 +1,59 @@
+package io.github.waterfallmc.waterfall;
+
+import lombok.AllArgsConstructor;
@ -39,17 +39,14 @@ index 00000000..1e33cd19
+ /**
+ * The number of players currently online.
+ */
+ @NonNull
+ private int onlinePlayers;
+ /**
+ * The maximum number of players that can be online.
+ */
+ @NonNull
+ private int maxPlayers;
+ /**
+ * The port for this server.
+ */
+ @NonNull
+ private int port;
+ /**
+ * The hostname for this server.
@ -214,5 +211,5 @@ index 9b81197f..ac99d02c 100644
} else
{
--
2.20.1
2.21.0