Fix javadoc warnings
This commit is contained in:
Shane Freeder
parent
9aae84ea43
commit
18c16a6111
11 changed files with 48 additions and 44 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 15b47a774783a9db24c742bb1fde6bb7c6404638 Mon Sep 17 00:00:00 2001
|
||||
From 3bac91384f39b6a374f2c3a1ef2a9622e78fc40b Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Wed, 13 Apr 2016 20:20:18 -0700
|
||||
Subject: [PATCH] Add handshake event to allow plugins to handle client
|
||||
|
|
@ -223,5 +223,5 @@ index 00000000..e44d03a2
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.12.2
|
||||
2.13.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b3c6eea6591a465f977f69067e464599a533209b Mon Sep 17 00:00:00 2001
|
||||
From a3cf6f6205e8985b4c575a6028c5a4bbb5ca5ba7 Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Fri, 4 Mar 2016 03:13:18 -0500
|
||||
Subject: [PATCH] Arrow pickup rule API
|
||||
|
|
@ -48,5 +48,5 @@ index 5850ab6c..a8d1826a 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.13.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
From 7d6cfc99f472097c25b7b7a2ea575724d7edaa5c Mon Sep 17 00:00:00 2001
|
||||
From 0d97df2900c479d7713b9b02c3eaeb6624c6a1c1 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Fri, 22 Apr 2016 01:43:11 -0500
|
||||
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
|
||||
index c7e9ba6f..3ffc7273 100644
|
||||
index 1dd50c56..74fc12e9 100644
|
||||
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
|
||||
@@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
|
||||
|
|
@ -41,5 +41,5 @@ index c7e9ba6f..3ffc7273 100644
|
|||
/**
|
||||
* Gets the amount of regained health
|
||||
--
|
||||
2.12.2
|
||||
2.13.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 50003066efa98b371abd15832192860bd0142e93 Mon Sep 17 00:00:00 2001
|
||||
From f7bf3b52cb8544319a06bd35ffd803c7e488a6c2 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
|
||||
|
|
@ -55,7 +55,7 @@ index 30d60247..938959aa 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 6e9fc84f..6f733fe0 100644
|
||||
index f1e9f200..c6613c0a 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
|
||||
|
|
@ -97,5 +97,5 @@ index 040509c1..0069bcc0 100644
|
|||
confirmed = true;
|
||||
} else {
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.13.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e044b4907713d4e48736de551bd97da999966ac1 Mon Sep 17 00:00:00 2001
|
||||
From d84e33b34c717e1200495f444aeb93582a7086e0 Mon Sep 17 00:00:00 2001
|
||||
From: Sweepyoface <github@sweepy.pw>
|
||||
Date: Sat, 17 Jun 2017 18:48:06 -0400
|
||||
Subject: [PATCH] Add UnknownCommandEvent
|
||||
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Add UnknownCommandEvent
|
|||
|
||||
diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..73f99907
|
||||
index 00000000..19d634c3
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
|
||||
@@ -0,0 +1,75 @@
|
||||
@@ -0,0 +1,77 @@
|
||||
+package org.bukkit.event.command;
|
||||
+
|
||||
+import org.bukkit.command.CommandSender;
|
||||
|
|
@ -70,6 +70,8 @@ index 00000000..73f99907
|
|||
+ * Sets message that will be returned
|
||||
+ * <p>
|
||||
+ * Set to null to avoid any message being sent
|
||||
+ *
|
||||
+ * @param message the message to be returned, or null
|
||||
+ */
|
||||
+ public void setMessage(String message) {
|
||||
+ this.message = message;
|
||||
|
|
@ -86,5 +88,5 @@ index 00000000..73f99907
|
|||
+}
|
||||
+
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.13.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e9962451b7d9b18132004f808364cb76fc3fe0cb Mon Sep 17 00:00:00 2001
|
||||
From 6621b1acfb0898fa33bd6d3461ebff382a569465 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 17 Jun 2017 16:30:44 -0400
|
||||
Subject: [PATCH] Profile Lookup Events
|
||||
|
|
@ -26,10 +26,10 @@ index 862910e0..c2922a7b 100644
|
|||
<artifactId>fastutil-lite</artifactId>
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..b46a1878
|
||||
index 00000000..6074ecde
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
|
||||
@@ -0,0 +1,44 @@
|
||||
@@ -0,0 +1,43 @@
|
||||
+package com.destroystokyo.paper.event.profile;
|
||||
+
|
||||
+import com.mojang.authlib.GameProfile;
|
||||
|
|
@ -41,7 +41,6 @@ index 00000000..b46a1878
|
|||
+
|
||||
+/**
|
||||
+ * Allows a plugin to be notified anytime AFTER a Profile has been looked up from the Mojang API
|
||||
+ *
|
||||
+ * This is an opportunity to view the response and potentially cache things.
|
||||
+ *
|
||||
+ * No guarantees are made about thread execution context for this event. If you need to know, check
|
||||
|
|
@ -59,7 +58,7 @@ index 00000000..b46a1878
|
|||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * The profile that was recently looked up. This profile can be mutated
|
||||
+ * @return The profile that was recently looked up. This profile can be mutated
|
||||
+ */
|
||||
+ @Nonnull
|
||||
+ public GameProfile getProfile() {
|
||||
|
|
@ -76,10 +75,10 @@ index 00000000..b46a1878
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..16f43b0f
|
||||
index 00000000..750b9334
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
|
||||
@@ -0,0 +1,152 @@
|
||||
@@ -0,0 +1,155 @@
|
||||
+package com.destroystokyo.paper.event.profile;
|
||||
+
|
||||
+import com.google.common.collect.Multimap;
|
||||
|
|
@ -123,8 +122,7 @@ index 00000000..16f43b0f
|
|||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Name of the player to look up a profile for
|
||||
+ * @return
|
||||
+ * @return Name of the profile
|
||||
+ */
|
||||
+ @Nonnull
|
||||
+ public String getName() {
|
||||
|
|
@ -132,7 +130,7 @@ index 00000000..16f43b0f
|
|||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * The UUID of the profile if it has already been provided by a plugin
|
||||
+ * @return The UUID of the profile if it has already been provided by a plugin
|
||||
+ *
|
||||
+ * If this value is left null by the completion of the event call, then the server will
|
||||
+ * trigger a call to the Mojang API to look up the UUID (Network Request), and subsequently, fire a
|
||||
|
|
@ -147,6 +145,8 @@ index 00000000..16f43b0f
|
|||
+ * Sets the UUID for this player name. This will skip the initial API call to find the players UUID.
|
||||
+ *
|
||||
+ * However, if Profile Properties are needed by the server, you must also set them or else an API call will still be made.
|
||||
+ *
|
||||
+ * @param uuid the UUID to set on the {@link GameProfile} or null to reset
|
||||
+ */
|
||||
+ public void setUUID(@Nullable UUID uuid) {
|
||||
+ this.uuid = uuid;
|
||||
|
|
@ -154,6 +154,8 @@ index 00000000..16f43b0f
|
|||
+
|
||||
+ /**
|
||||
+ * Get the properties for this profile
|
||||
+ *
|
||||
+ * @return the property map to attach to the new {@link GameProfile}
|
||||
+ */
|
||||
+ @Nonnull
|
||||
+ public Multimap<String, Property> getProperties() {
|
||||
|
|
@ -162,7 +164,7 @@ index 00000000..16f43b0f
|
|||
+
|
||||
+ /**
|
||||
+ * Completely replaces all Properties with the new provided properties
|
||||
+ * @param properties
|
||||
+ * @param properties the properties to set on the new profile
|
||||
+ */
|
||||
+ public void setProperties(Multimap<String, Property> properties) {
|
||||
+ this.properties = new PropertyMap();
|
||||
|
|
@ -171,7 +173,7 @@ index 00000000..16f43b0f
|
|||
+
|
||||
+ /**
|
||||
+ * Adds additional properties, without removing the original properties
|
||||
+ * @param properties
|
||||
+ * @param properties the properties to add to the existing properties
|
||||
+ */
|
||||
+ public void addProperties(Multimap<String, Property> properties) {
|
||||
+ this.properties.putAll(properties);
|
||||
|
|
@ -185,7 +187,7 @@ index 00000000..16f43b0f
|
|||
+ return handlers;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ /*
|
||||
+ * Wraps the Profile Repository so we can intercept all lookups
|
||||
+ */
|
||||
+ public static GameProfileRepository wrapProfileRepository(final GameProfileRepository orig) {
|
||||
|
|
@ -233,5 +235,5 @@ index 00000000..16f43b0f
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.13.0
|
||||
2.13.2
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue