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

Properly fix JavaDoc linting issues 

Fixes our own, and upstream's, issues with the stricter Java 8 JavaDoc
linter.

Also removes the destroystokyo-release maven repository. I'm not sure
why I added it originally, but it's unnecessary now.
This commit is contained in:
Zach Brown 2017-06-10 17:11:10 -05:00
parent 8121250409
commit fe4678c414
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
12 changed files with 558 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Spigot-API-Patches/0001-POM-changes.patch
View File

@ -1,14 +1,14 @@
From 8baf2feff02aeb2080fdafe260e4f5192877825f Mon Sep 17 00:00:00 2001
From 121bc2816dfe4ab6c4c7b4c155fb57e04b3f7caa Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index ecb870a0..48c2e544 100644
index ecb870a0..968f9091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@@ -4,35 +4,36 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@ -37,7 +37,6 @@ index ecb870a0..48c2e544 100644
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <!-- Paper - Bump to 1.8 - Because Duh... -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -59,7 +58,7 @@ index ecb870a0..48c2e544 100644
</snapshotRepository>
</distributionManagement>
@@ -44,6 +46,13 @@
@@ -44,6 +45,13 @@
</pluginRepository>
</pluginRepositories>
@ -73,7 +72,7 @@ index ecb870a0..48c2e544 100644
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -58,6 +67,13 @@
@@ -58,6 +66,13 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
@ -87,7 +86,7 @@ index ecb870a0..48c2e544 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -102,6 +118,7 @@
@@ -102,6 +117,7 @@
</dependencies>
<build>
@ -95,7 +94,7 @@ index ecb870a0..48c2e544 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -124,26 +141,6 @@
@@ -124,26 +140,6 @@
</dependencies>
</plugin>
<plugin>
@ -122,7 +121,7 @@ index ecb870a0..48c2e544 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
@@ -156,8 +153,7 @@
@@ -156,8 +152,7 @@
</execution>
</executions>
<configuration>

6
Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
View File

@ -1,14 +1,14 @@
From bab3dd6f3335c4da837a24234ac0455bcedd6a0f Mon Sep 17 00:00:00 2001
From 1ea2f5f4ceef51d35a4266ed0b3eb471fde1bff8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] add Trove and FastUtil to Bukkit
diff --git a/pom.xml b/pom.xml
index 48c2e544..5336fe55 100644
index 968f9091..04168f66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,19 @@
@@ -54,6 +54,19 @@
<dependencies>
<dependency>

209
Spigot-API-Patches/0003-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 641ad825cfd307896323c7de8fccada29951328b Mon Sep 17 00:00:00 2001
From c511dea5f0acfa883e9b0d0c2acd313e3366d01f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -161,7 +161,7 @@ index 00000000..8c43e206
+}
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
new file mode 100644
index 00000000..96057fc7
index 00000000..feddcdbd
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +1,81 @@
@ -207,10 +207,10 @@ index 00000000..96057fc7
+ /**
+ * Wraps an event executor and associates a timing handler to it.
+ *
+ * @param executor
+ * @param plugin
+ * @param method
+ * @param eventClass
+ * @param executor Executor to wrap
+ * @param plugin Owning plugin
+ * @param method EventHandler method
+ * @param eventClass Owning class
+ */
+ public TimedEventExecutor(EventExecutor executor, Plugin plugin, Method method, Class<? extends Event> eventClass) {
+ this.executor = executor;
@ -248,10 +248,10 @@ index 00000000..96057fc7
+}
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
new file mode 100644
index 00000000..8b2d1b82
index 00000000..b2260104
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,72 @@
@@ -0,0 +1,76 @@
+/*
+ * This file is licensed under the MIT License (MIT).
+ *
@ -283,6 +283,8 @@ index 00000000..8b2d1b82
+public interface Timing extends AutoCloseable {
+ /**
+ * Starts timing the execution until {@link #stopTiming()} is called.
+ *
+ * @return Timing
+ */
+ Timing startTiming();
+
@ -297,6 +299,8 @@ index 00000000..8b2d1b82
+ * Starts timing the execution until {@link #stopTiming()} is called.
+ *
+ * But only if we are on the primary thread.
+ *
+ * @return Timing
+ */
+ Timing startTimingIfSync();
+
@ -1184,7 +1188,7 @@ index 00000000..623dda49
+}
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
new file mode 100644
index 00000000..0571c9e7
index 00000000..32e4bb1e
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,284 @@
@ -1333,8 +1337,8 @@ index 00000000..0571c9e7
+ }
+
+ /**
+ * Sets whether or not the Timings should monitor at Verbose level.
+ * <p/>
+ * <p>Sets whether or not the Timings should monitor at Verbose level.</p>
+ *
+ * When Verbose is disabled, high-frequency timings will not be available.
+ * Calling this will reset timing data.
+ *
@ -2284,10 +2288,10 @@ index 00000000..5edaba12
+}
diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
new file mode 100644
index 00000000..5fdf7c4c
index 00000000..96274975
--- /dev/null
+++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +1,123 @@
@@ -0,0 +1,129 @@
+package co.aikar.util;
+
+import com.google.common.base.Function;
@ -2310,9 +2314,10 @@ index 00000000..5fdf7c4c
+
+ /**
+ * Creates a key/value "JSONPair" object
+ * @param key
+ * @param obj
+ * @return
+ *
+ * @param key Key to use
+ * @param obj Value to use
+ * @return JSONPair
+ */
+ public static JSONPair pair(String key, Object obj) {
+ return new JSONPair(key, obj);
@ -2323,9 +2328,10 @@ index 00000000..5fdf7c4c
+ }
+
+ /**
+ * Creates a new JSON object from multiple JsonPair key/value pairs
+ * @param data
+ * @return
+ * Creates a new JSON object from multiple JSONPair key/value pairs
+ *
+ * @param data JSONPairs
+ * @return Map
+ */
+ public static Map createObject(JSONPair... data) {
+ return appendObjectData(new LinkedHashMap(), data);
@ -2333,9 +2339,10 @@ index 00000000..5fdf7c4c
+
+ /**
+ * This appends multiple key/value Obj pairs into a JSON Object
+ * @param parent
+ * @param data
+ * @return
+ *
+ * @param parent Map to be appended to
+ * @param data Data to append
+ * @return Map
+ */
+ public static Map appendObjectData(Map parent, JSONPair... data) {
+ for (JSONPair JSONPair : data) {
@ -2346,8 +2353,9 @@ index 00000000..5fdf7c4c
+
+ /**
+ * This builds a JSON array from a set of data
+ * @param data
+ * @return
+ *
+ * @param data Data to build JSON array from
+ * @return List
+ */
+ public static List toArray(Object... data) {
+ return Lists.newArrayList(data);
@ -2355,10 +2363,11 @@ index 00000000..5fdf7c4c
+
+ /**
+ * These help build a single JSON array using a mapper function
+ * @param collection
+ * @param mapper
+ * @param <E>
+ * @return
+ *
+ * @param collection Collection to apply to
+ * @param mapper Mapper to apply
+ * @param <E> Element Type
+ * @return List
+ */
+ public static <E> List toArrayMapper(E[] collection, Function<E, Object> mapper) {
+ return toArrayMapper(Lists.newArrayList(collection), mapper);
@ -2377,10 +2386,11 @@ index 00000000..5fdf7c4c
+
+ /**
+ * These help build a single JSON Object from a collection, using a mapper function
+ * @param collection
+ * @param mapper
+ * @param <E>
+ * @return
+ *
+ * @param collection Collection to apply to
+ * @param mapper Mapper to apply
+ * @param <E> Element Type
+ * @return Map
+ */
+ public static <E> Map toObjectMapper(E[] collection, Function<E, JSONPair> mapper) {
+ return toObjectMapper(Lists.newArrayList(collection), mapper);
@ -2413,10 +2423,10 @@ index 00000000..5fdf7c4c
+}
diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
new file mode 100644
index 00000000..79fa9d52
index 00000000..24eae4be
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +1,70 @@
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015. Starlis LLC / dba Empire Minecraft
+ *
@ -2476,7 +2486,8 @@ index 00000000..79fa9d52
+
+ /**
+ * Due to java stuff, you will need to cast it to (Function) for some cases
+ * @param <T>
+ *
+ * @param <T> Type
+ */
+ public abstract static class Feeder <T> implements Function<T, T> {
+ @Override
@ -2489,10 +2500,10 @@ index 00000000..79fa9d52
+}
diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
new file mode 100644
index 00000000..a9f29199
index 00000000..1474384e
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,332 @@
@@ -0,0 +1,340 @@
+/*
+ * This file is licensed under the MIT License (MIT).
+ *
@ -2554,8 +2565,8 @@ index 00000000..a9f29199
+
+ /**
+ * Initializes an auto loading map using specified loader and backing map
+ * @param backingMap
+ * @param loader
+ * @param backingMap Map to wrap
+ * @param loader Loader
+ */
+ public LoadingMap(Map<K, V> backingMap, Function<K, V> loader) {
+ this.backingMap = backingMap;
@ -2564,11 +2575,12 @@ index 00000000..a9f29199
+
+ /**
+ * Creates a new LoadingMap with the specified map and loader
+ * @param backingMap
+ * @param loader
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param backingMap Actual map being used.
+ * @param loader Loader to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map
+ */
+ public static <K, V> Map<K, V> of(Map<K, V> backingMap, Function<K, V> loader) {
+ return new LoadingMap<K, V>(backingMap, loader);
@ -2616,11 +2628,12 @@ index 00000000..a9f29199
+ * @see #newAutoMap
+ *
+ * new Auto initializing map using a HashMap.
+ * @param keyClass
+ * @param valueClass
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param keyClass Class used for the K generic
+ * @param valueClass Class used for the V generic
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map that auto instantiates on .get()
+ */
+ public static <K, V> Map<K, V> newHashAutoMap(final Class<? extends K> keyClass, final Class<? extends V> valueClass) {
+ return newAutoMap(new HashMap<K, V>(), keyClass, valueClass);
@ -2630,10 +2643,11 @@ index 00000000..a9f29199
+ * @see #newAutoMap
+ *
+ * new Auto initializing map using a HashMap.
+ * @param valueClass
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param valueClass Class used for the V generic
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map that auto instantiates on .get()
+ */
+ public static <K, V> Map<K, V> newHashAutoMap(final Class<? extends V> valueClass) {
+ return newHashAutoMap(null, valueClass);
@ -2644,13 +2658,13 @@ index 00000000..a9f29199
+ *
+ * new Auto initializing map using a HashMap.
+ *
+ * @param keyClass
+ * @param valueClass
+ * @param initialCapacity
+ * @param loadFactor
+ * @param <K>
+ * @param <V>
+ * @return
+ * @param keyClass Class used for the K generic
+ * @param valueClass Class used for the V generic
+ * @param initialCapacity Initial capacity to use
+ * @param loadFactor Load factor to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map that auto instantiates on .get()
+ */
+ public static <K, V> Map<K, V> newHashAutoMap(final Class<? extends K> keyClass, final Class<? extends V> valueClass, int initialCapacity, float loadFactor) {
+ return newAutoMap(new HashMap<K, V>(initialCapacity, loadFactor), keyClass, valueClass);
@ -2661,12 +2675,12 @@ index 00000000..a9f29199
+ *
+ * new Auto initializing map using a HashMap.
+ *
+ * @param valueClass
+ * @param initialCapacity
+ * @param loadFactor
+ * @param <K>
+ * @param <V>
+ * @return
+ * @param valueClass Class used for the V generic
+ * @param initialCapacity Initial capacity to use
+ * @param loadFactor Load factor to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map that auto instantiates on .get()
+ */
+ public static <K, V> Map<K, V> newHashAutoMap(final Class<? extends V> valueClass, int initialCapacity, float loadFactor) {
+ return newHashAutoMap(null, valueClass, initialCapacity, loadFactor);
@ -2674,10 +2688,11 @@ index 00000000..a9f29199
+
+ /**
+ * Initializes an auto loading map using a HashMap
+ * @param loader
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param loader Loader to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map
+ */
+ public static <K, V> Map<K, V> newHashMap(Function<K, V> loader) {
+ return new LoadingMap<K, V>(new HashMap<K, V>(), loader);
@ -2685,12 +2700,13 @@ index 00000000..a9f29199
+
+ /**
+ * Initializes an auto loading map using a HashMap
+ * @param loader
+ * @param initialCapacity
+ * @param loadFactor
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param loader Loader to use
+ * @param initialCapacity Initial capacity to use
+ * @param loadFactor Load factor to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map
+ */
+ public static <K, V> Map<K, V> newHashMap(Function<K, V> loader, int initialCapacity, float loadFactor) {
+ return new LoadingMap<K, V>(new HashMap<K, V>(initialCapacity, loadFactor), loader);
@ -2698,10 +2714,11 @@ index 00000000..a9f29199
+
+ /**
+ * Initializes an auto loading map using an Identity HashMap
+ * @param loader
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param loader Loader to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map
+ */
+ public static <K, V> Map<K, V> newIdentityHashMap(Function<K, V> loader) {
+ return new LoadingMap<K, V>(new IdentityHashMap<K, V>(), loader);
@ -2709,11 +2726,12 @@ index 00000000..a9f29199
+
+ /**
+ * Initializes an auto loading map using an Identity HashMap
+ * @param loader
+ * @param initialCapacity
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param loader Loader to use
+ * @param initialCapacity Initial capacity to use
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map
+ */
+ public static <K, V> Map<K, V> newIdentityHashMap(Function<K, V> loader, int initialCapacity) {
+ return new LoadingMap<K, V>(new IdentityHashMap<K, V>(initialCapacity), loader);
@ -2814,7 +2832,8 @@ index 00000000..a9f29199
+
+ /**
+ * Due to java stuff, you will need to cast it to (Function) for some cases
+ * @param <T>
+ *
+ * @param <T> Type
+ */
+ public abstract static class Feeder <T> implements Function<T, T> {
+ @Override
@ -2827,10 +2846,10 @@ index 00000000..a9f29199
+}
diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
new file mode 100644
index 00000000..3a288d2a
index 00000000..df592d85
--- /dev/null
+++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +1,100 @@
@@ -0,0 +1,102 @@
+/*
+ * This file is licensed under the MIT License (MIT).
+ *
@ -2863,8 +2882,9 @@ index 00000000..3a288d2a
+
+/**
+ * Implements a Most Recently Used cache in front of a backing map, to quickly access the last accessed result.
+ * @param <K>
+ * @param <V>
+ *
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ */
+public class MRUMapCache<K, V> extends AbstractMap<K, V> {
+ final Map<K, V> backingMap;
@ -2922,10 +2942,11 @@ index 00000000..3a288d2a
+
+ /**
+ * Wraps the specified map with a most recently used cache
+ * @param map
+ * @param <K>
+ * @param <V>
+ * @return
+ *
+ * @param map Map to be wrapped
+ * @param <K> Key Type of the Map
+ * @param <V> Value Type of the Map
+ * @return Map
+ */
+ public static <K, V> Map<K, V> of(Map<K, V> map) {
+ return new MRUMapCache<K, V>(map);

38
Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
View File

@ -1,4 +1,4 @@
From c2ec6e008a1a9c6ef9763c0c1ad45783b32b0e7c Mon Sep 17 00:00:00 2001
From 2a34bc238c64b2b4729d088b3f937949e2a3857a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 29 Feb 2016 20:02:40 -0600
Subject: [PATCH] Player Tab List and Title APIs
@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs
diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
new file mode 100644
index 00000000..e1ecd447
index 00000000..3c2b63db
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/Title.java
@@ -0,0 +1,358 @@
@ -23,7 +23,7 @@ index 00000000..e1ecd447
+
+/**
+ * Represents a title to may be sent to a {@link Player}.
+ * <p>
+ *
+ * <p>A title can be sent without subtitle text.</p>
+ */
+public final class Title {
@ -49,7 +49,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Create a title with the default time values and no subtitle.
+ * <p>
+ *
+ * <p>Times use default values.</p>
+ *
+ * @param title the main text of the title
@ -61,7 +61,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Create a title with the default time values and no subtitle.
+ * <p>
+ *
+ * <p>Times use default values.</p>
+ *
+ * @param title the main text of the title
@ -73,7 +73,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Create a title with the default time values and no subtitle.
+ * <p>
+ *
+ * <p>Times use default values.</p>
+ *
+ * @param title the main text of the title
@ -85,7 +85,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Create a title with the default time values.
+ * <p>
+ *
+ * <p>Times use default values.</p>
+ *
+ * @param title the main text of the title
@ -97,7 +97,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Create a title with the default time values.
+ * <p>
+ *
+ * <p>Times use default values.</p>
+ *
+ * @param title the main text of the title
@ -109,7 +109,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Create a title with the default time values.
+ * <p>
+ *
+ * <p>Times use default values.</p>
+ *
+ * @param title the main text of the title
@ -162,7 +162,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Creates a new title.
+ * <p>
+ *
+ * <p>It is recommended to the {@link BaseComponent} constrctors.</p>
+ *
+ * @param title the main text of the title
@ -201,7 +201,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Gets the number of ticks to fade in.
+ * <p>
+ *
+ * <p>The returned value is never negative.</p>
+ *
+ * @return the number of ticks to fade in
@ -212,7 +212,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Gets the number of ticks to stay.
+ * <p>
+ *
+ * <p>The returned value is never negative.</p>
+ *
+ * @return the number of ticks to stay
@ -223,7 +223,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Gets the number of ticks to fade out.
+ * <p>
+ *
+ * <p>The returned value is never negative.</p>
+ *
+ * @return the number of ticks to fade out
@ -272,7 +272,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Sets the title to the given text.
+ * <p>
+ *
+ * <p>It is recommended to the {@link BaseComponent} methods.</p>
+ *
+ * @param title the title text
@ -306,7 +306,7 @@ index 00000000..e1ecd447
+
+ /**
+ * Sets the subtitle to the given text.
+ * <p>
+ *
+ * <p>It is recommended to the {@link BaseComponent} methods.</p>
+ *
+ * @param subtitle the title text
@ -369,7 +369,7 @@ index 00000000..e1ecd447
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7e3e3b7f..d19a928d 100644
index dc593801..993abc13 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -472,7 +472,7 @@ index 7e3e3b7f..d19a928d 100644
+
+ /**
+ * Show the title to the player, overriding any previously displayed title.
+ * <p>
+ *
+ * <p>This method overrides any previous title, use {@link #updateTitle(Title)} to change the existing one.</p>
+ *
+ * @param title the title to send
@ -482,7 +482,7 @@ index 7e3e3b7f..d19a928d 100644
+
+ /**
+ * Show the title to the player, overriding any previously displayed title.
+ * <p>
+ *
+ * <p>This method doesn't override previous titles, but changes their values.</p>
+ *
+ * @param title the title to send
@ -498,5 +498,5 @@ index 7e3e3b7f..d19a928d 100644
/**
--
2.11.0
2.13.0.windows.1

6
Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
View File

@ -1,4 +1,4 @@
From 31a91b94783da85083becaa48afbad20fc8019bb Mon Sep 17 00:00:00 2001
From 2ba17bea4632f1947234d462d0e7bc597450f0fe Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors.
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml
index 5336fe55..a9009636 100644
index 04168f66..862910e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,12 @@
@@ -127,6 +127,12 @@
<version>1.3</version>
<scope>test</scope>
</dependency>

28
Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
View File

@ -1,22 +1,31 @@
From 33bc086f382a2e21d39d4ce384998ce5ed01bd19 Mon Sep 17 00:00:00 2001
From be5afd90beb1063d903d94f39ad8ce38c8545536 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:05:21 -0400
Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
index 8ab76b1..42aad88 100644
index 8ab76b1d..7d28155b 100644
--- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
@@ -20,6 +20,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
@@ -6,6 +6,8 @@ import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
+import javax.annotation.Nullable;
+
/**
* This event will fire when a player is finishing consuming an item (food,
* potion, milk bucket).
@@ -20,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean isCancelled = false;
private ItemStack item;
+ private ItemStack replacement; // Paper
+ @Nullable private ItemStack replacement; // Paper
/**
* @param player the player consuming
@@ -55,6 +56,24 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
@@ -55,6 +58,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
}
}
@ -24,7 +33,10 @@ index 8ab76b1..42aad88 100644
+ /**
+ * Return the custom item stack that will replace the consumed item, or null if no
+ * custom replacement has been set (which means the default replacement will be used).
+ *
+ * @return The custom item stack that will replace the consumed item or null
+ */
+ @Nullable
+ public ItemStack getReplacement() {
+ return this.replacement;
+ }
@ -32,8 +44,10 @@ index 8ab76b1..42aad88 100644
+ /**
+ * Set a custom item stack to replace the consumed item. Pass null to clear any custom
+ * stack that has been set and use the default replacement.
+ *
+ * @param replacement Replacement item to set, null to clear any custom stack and use default
+ */
+ public void setReplacement(ItemStack replacement) {
+ public void setReplacement(@Nullable ItemStack replacement) {
+ this.replacement = replacement;
+ }
+ // Paper end
@ -42,5 +56,5 @@ index 8ab76b1..42aad88 100644
return this.isCancelled;
}
--
2.9.2.windows.1
2.13.0.windows.1

19
Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
View File

@ -1,4 +1,4 @@
From 6007028122abaeec6ca165c81a0102105305f0b0 Mon Sep 17 00:00:00 2001
From 50003066efa98b371abd15832192860bd0142e93 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,16 +6,18 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4a725d79..4c20a1be 100644
index 4a725d79..498dfd33 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1197,6 +1197,13 @@ public final class Bukkit {
@@ -1197,6 +1197,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
+
+ /**
+ * Reload the Command Aliases in commands.yml
+ *
+ * @return Whether the reload was successful
+ */
+ public static boolean reloadCommandAliases() {
+ return server.reloadCommandAliases();
@ -35,18 +37,19 @@ index 3c550d06..4f077b7c 100644
+ boolean reloadCommandAliases(); // Paper
}
diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
index 30d60247..d8a75607 100644
index 30d60247..938959aa 100644
--- a/src/main/java/org/bukkit/command/CommandMap.java
+++ b/src/main/java/org/bukkit/command/CommandMap.java
@@ -123,4 +123,12 @@ public interface CommandMap {
@@ -123,4 +123,13 @@ public interface CommandMap {
* @throws IllegalArgumentException if either sender or cmdLine are null
*/
public List<String> tabComplete(CommandSender sender, String cmdLine, Location location) throws IllegalArgumentException;
+
+ // Paper start - Expose Known Commands
+ /**
+ * Return a Map (String -> Command) of Known Commands
+ * @return Known Commands
+ * Return a Map of known commands
+ *
+ * @return known commands
+ */
+ public java.util.Map<String, Command> getKnownCommands();
+ // Paper end
@ -94,5 +97,5 @@ index 040509c1..0069bcc0 100644
confirmed = true;
} else {
--
2.13.0
2.13.0.windows.1

11
Spigot-API-Patches/0047-PlayerTeleportEndGatewayEvent.patch
View File

@ -1,4 +1,4 @@
From 6f53556434c1c5c59e2642b0534ff0a5854e4d50 Mon Sep 17 00:00:00 2001
From 5a007aa00644c0fc23b76553bd92756e5517eaf1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 31 Dec 2016 20:29:33 -0500
Subject: [PATCH] PlayerTeleportEndGatewayEvent
@ -7,10 +7,10 @@ Allows you to access the Gateway being used in a teleport event
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
new file mode 100644
index 0000000..84eb0a5
index 00000000..bdefbc9f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
@@ -0,0 +1,26 @@
@@ -0,0 +1,27 @@
+package com.destroystokyo.paper.event.player;
+
+import org.bukkit.Location;
@ -31,12 +31,13 @@ index 0000000..84eb0a5
+
+ /**
+ * The gateway triggering the teleport
+ * @return
+ *
+ * @return EndGateway used
+ */
+ public EndGateway getGateway() {
+ return gateway;
+ }
+}
--
2.9.3
2.13.0.windows.1

12
Spigot-API-Patches/0049-Add-fromBottle-flag-to-Experience-Orbs.patch
View File

@ -1,23 +1,25 @@
From e20b2ab5e6e8c3ce48744201e26165aff882eabf Mon Sep 17 00:00:00 2001
From e4a91b4babe80ccab09955b6069d1498676c5e53 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 14 Jan 2017 16:15:20 -0600
Subject: [PATCH] Add fromBottle flag to Experience Orbs
diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
index c286edfd..bcb68fa7 100644
index c286edfd..e8a83c06 100644
--- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
+++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
@@ -18,4 +18,9 @@ public interface ExperienceOrb extends Entity {
@@ -18,4 +18,11 @@ public interface ExperienceOrb extends Entity {
* @param value Amount of experience
*/
public void setExperience(int value);
+
+ /**
+ * Check if this orb was spawned from a ThrownExpBottle
+ * Check if this orb was spawned from a {@link ThrownExpBottle}
+ *
+ * @return if orb was spawned from a bottle
+ */
+ public boolean isFromBottle();
}
--
2.11.0
2.13.0.windows.1

8
Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -1,4 +1,4 @@
From 8ef5f6a840daf5e319219de47bbd4ef2e97ace64 Mon Sep 17 00:00:00 2001
From c1215b45d6da3da9cc9cbdee0f618551b80ebff0 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:24 -0700
Subject: [PATCH] Add configuration option to prevent player names from being
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4c20a1be..b7f0d5d9 100644
index 498dfd33..4f27b9f2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1204,6 +1204,16 @@ public final class Bukkit {
@@ -1206,6 +1206,16 @@ public final class Bukkit {
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
@ -58,5 +58,5 @@ index 3bfa31fc..dbbf0a42 100644
}
return completions;
--
2.13.0
2.13.0.windows.1

361
Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch Normal file
View File

@ -0,0 +1,361 @@
From ae76f2d87e3022fd57fde5fd771639aff7bb2728 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
index 9597a9d8..478f2c3c 100644
--- a/src/main/java/org/bukkit/NamespacedKey.java
+++ b/src/main/java/org/bukkit/NamespacedKey.java
@@ -27,8 +27,8 @@ public final class NamespacedKey {
/**
* Create a key in a specific namespace.
*
- * @param namespace
- * @param key
+ * @param namespace String representing a grouping of keys
+ * @param key Name for this specific key
* @deprecated should never be used by plugins, for internal use only!!
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 4abdbadf..dd0dcb16 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1395,6 +1395,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1410,6 +1411,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1459,6 +1461,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1478,6 +1481,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1533,6 +1537,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1554,6 +1559,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
index 0e615711..e912299b 100644
--- a/src/main/java/org/bukkit/entity/AbstractHorse.java
+++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
@@ -21,7 +21,7 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
public Horse.Variant getVariant();
/**
- * @param variant
+ * @param variant Variant to set
* @deprecated you are required to spawn a different entity
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
index 98af0563..ec6890ae 100644
--- a/src/main/java/org/bukkit/entity/Guardian.java
+++ b/src/main/java/org/bukkit/entity/Guardian.java
@@ -12,7 +12,7 @@ public interface Guardian extends Monster {
public boolean isElder();
/**
- * @param shouldBeElder
+ * @param shouldBeElder Sets whether the Guardian is an Elder
* @deprecated Must spawn a new {@link ElderGuardian}.
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
index cfce8fa5..8660070b 100644
--- a/src/main/java/org/bukkit/entity/Horse.java
+++ b/src/main/java/org/bukkit/entity/Horse.java
@@ -151,7 +151,7 @@ public interface Horse extends AbstractHorse {
public boolean isCarryingChest();
/**
- * @param chest
+ * @param chest Sets whether the Horse is carrying a chest
* @deprecated see {@link ChestedHorse}
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 41ba6c11..0c3eb03f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -410,7 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*
* Use supplied alternative character to the section symbol to represent legacy color codes.
*
- * @param alternateChar Alternate symbol such as '&'
+ * @param alternateChar Alternate symbol such as '&amp;'
* @param message The message to send
*/
public void sendActionBar(char alternateChar, String message);
@@ -477,6 +477,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Update the subtitle of titles displayed to the player
*
+ * @param subtitle Subtitle to set
* @deprecated Use {@link #updateTitle(Title)}
*/
@Deprecated
@@ -485,6 +486,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Update the subtitle of titles displayed to the player
*
+ * @param subtitle Subtitle to set
* @deprecated Use {@link #updateTitle(Title)}
*/
@Deprecated
@@ -493,6 +495,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Show the given title to the player, along with the last subtitle set, using the last set times
*
+ * @param title Title to set
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
*/
@Deprecated
@@ -501,6 +504,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Show the given title to the player, along with the last subtitle set, using the last set times
*
+ * @param title Title to set
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
*/
@Deprecated
@@ -1399,6 +1403,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1414,6 +1419,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1463,6 +1469,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1482,6 +1489,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1537,6 +1545,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1558,6 +1567,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
+ * @param <T> Type
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1719,7 +1729,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* Gets player locale language.
*
* @return the player's client language settings
- * @deprecated Use {@link Player#getLocale()
+ * @deprecated Use {@link Player#getLocale()}
*/
@Deprecated
public String getLocale()
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
index 2a02ab85..e33d00b3 100644
--- a/src/main/java/org/bukkit/entity/Skeleton.java
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
@@ -15,6 +15,7 @@ public interface Skeleton extends Monster {
public SkeletonType getSkeletonType();
/**
+ * @param type Type to set
* @deprecated Must spawn a new subtype variant
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
index cf53ea22..62923379 100644
--- a/src/main/java/org/bukkit/entity/Zombie.java
+++ b/src/main/java/org/bukkit/entity/Zombie.java
@@ -29,14 +29,14 @@ public interface Zombie extends Monster {
public boolean isVillager();
/**
- * @param flag
+ * @param flag Sets whether the Zombie is a villager
* @deprecated must spawn {@link ZombieVillager}.
*/
@Deprecated
public void setVillager(boolean flag);
/**
- * @param profession
+ * @param profession Sets the ZombieVillager's profession
* @see ZombieVillager#getVillagerProfession()
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index de4fb37f..f1de2af6 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -24,6 +24,7 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param hostname The hostname that was used to connect to the server
* @param address The address the player used to connect, provided for
* timing issues
+ * @param realAddress The unspoofed, actual address, that the player used to connect
*/
public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address, final InetAddress realAddress) { // Spigot
super(player);
@@ -47,6 +48,7 @@ public class PlayerLoginEvent extends PlayerEvent {
* timing issues
* @param result The result status for this event
* @param message The message to be displayed if result denies login
+ * @param realAddress The unspoofed, actual address, that the player used to connect
*/
public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
this(player, hostname, address, realAddress); // Spigot
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
index c8e68570..45431b36 100644
--- a/src/main/java/org/bukkit/inventory/Merchant.java
+++ b/src/main/java/org/bukkit/inventory/Merchant.java
@@ -32,7 +32,7 @@ public interface Merchant {
*
* @param i the index
* @return the recipe
- * @throws IndexOutOfBoundsException
+ * @throws IndexOutOfBoundsException Throws when specified index is larger than Merchant's inventory
*/
MerchantRecipe getRecipe(int i) throws IndexOutOfBoundsException;
@@ -41,7 +41,7 @@ public interface Merchant {
*
* @param i the index
* @param recipe the recipe
- * @throws IndexOutOfBoundsException
+ * @throws IndexOutOfBoundsException Throws when specified index is larger than Merchant's inventory
*/
void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException;
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
index 7aa5a2d1..54d85d0c 100644
--- a/src/main/java/org/bukkit/potion/Potion.java
+++ b/src/main/java/org/bukkit/potion/Potion.java
@@ -78,6 +78,7 @@ public class Potion {
}
/**
+ * @param name Unused, always uses {@link PotionType#WATER}
* @deprecated
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
index 40f8d12b..33d19228 100644
--- a/src/main/java/org/bukkit/potion/PotionBrewer.java
+++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
@@ -34,6 +34,8 @@ public interface PotionBrewer {
* a potion with the given type.
*
* @param type The type of the potion
+ * @param upgraded Whether the potion is upgraded
+ * @param extended Whether the potion is extended
* @return The list of effects
*/
public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended);
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
index 60470b88..76313d4d 100644
--- a/src/main/java/org/bukkit/potion/PotionType.java
+++ b/src/main/java/org/bukkit/potion/PotionType.java
@@ -66,6 +66,7 @@ public enum PotionType {
}
/**
+ * @return Damage value associated with this PotionType, broken
* @deprecated Non-functional
*/
@Deprecated
@@ -78,6 +79,8 @@ public enum PotionType {
}
/**
+ * @param damage Damage value associated with a PotionType
+ * @return PotionType for given damage value, broken
* @deprecated Non-functional
*/
@Deprecated
@@ -86,6 +89,8 @@ public enum PotionType {
}
/**
+ * @param effectType EffectType
+ * @return Associated PotionType
* @deprecated Misleading
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
index 170ae21a..c0de37a7 100644
--- a/src/main/java/org/bukkit/scoreboard/Team.java
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
@@ -84,7 +84,7 @@ public interface Team {
* names are handled by prefixes / suffixes.
*
* @return team color, defaults to {@link ChatColor#RESET}
- * @throws IllegalStateException
+ * @throws IllegalStateException if this team has been unregistered
*/
ChatColor getColor() throws IllegalStateException;
--
2.13.0.windows.1

4
pom.xml
View File

@ -40,10 +40,6 @@
<id>aikar</id>
<url>http://ci.emc.gs/nexus/content/groups/aikar/</url>
</repository>
<repository>
<id>destroystokyo-releases</id>
<url>https://repo.destroystokyo.com/repository/maven-releases/</url>
</repository>
</repositories>
<distributionManagement>