Fix compilation
This commit is contained in:
parent
08aaab0105
commit
d9ad4e8bd8
39 changed files with 207 additions and 467 deletions
|
@ -1,4 +1,4 @@
|
|||
From cb9aa21c2fd11a5f9775048e79cd86369fd5fe78 Mon Sep 17 00:00:00 2001
|
||||
From 64d9488334e3b3e421967247c570baeaff171002 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
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
|
|||
|
||||
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..64531fcc
|
||||
index 000000000..64531fcce
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
|
||||
@@ -0,0 +1,84 @@
|
||||
|
@ -96,7 +96,7 @@ index 00000000..64531fcc
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..9b45ce88
|
||||
index 000000000..9b45ce887
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
|
||||
@@ -0,0 +1,68 @@
|
||||
|
@ -170,7 +170,7 @@ index 00000000..9b45ce88
|
|||
+}
|
||||
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..933ecf9b
|
||||
index 000000000..933ecf9bd
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
||||
@@ -0,0 +1,83 @@
|
||||
|
@ -259,7 +259,7 @@ index 00000000..933ecf9b
|
|||
+}
|
||||
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..a21e5ead
|
||||
index 000000000..a21e5ead5
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/Timing.java
|
||||
@@ -0,0 +1,83 @@
|
||||
|
@ -348,7 +348,7 @@ index 00000000..a21e5ead
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
|
||||
new file mode 100644
|
||||
index 00000000..a5d13a1e
|
||||
index 000000000..a5d13a1e4
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingData.java
|
||||
@@ -0,0 +1,122 @@
|
||||
|
@ -476,7 +476,7 @@ index 00000000..a5d13a1e
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..cc0390c0
|
||||
index 000000000..cc0390c06
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingHandler.java
|
||||
@@ -0,0 +1,227 @@
|
||||
|
@ -709,7 +709,7 @@ index 00000000..cc0390c0
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
|
||||
new file mode 100644
|
||||
index 00000000..ddaed812
|
||||
index 000000000..ddaed8127
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
|
||||
@@ -0,0 +1,354 @@
|
||||
|
@ -1069,7 +1069,7 @@ index 00000000..ddaed812
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
|
||||
new file mode 100644
|
||||
index 00000000..86d5ac6b
|
||||
index 000000000..86d5ac6bd
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
|
||||
@@ -0,0 +1,58 @@
|
||||
|
@ -1133,7 +1133,7 @@ index 00000000..86d5ac6b
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
|
||||
new file mode 100644
|
||||
index 00000000..df142a89
|
||||
index 000000000..df142a89b
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
|
||||
@@ -0,0 +1,116 @@
|
||||
|
@ -1255,7 +1255,7 @@ index 00000000..df142a89
|
|||
+}
|
||||
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..0b34e0d0
|
||||
index 000000000..0b34e0d01
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/Timings.java
|
||||
@@ -0,0 +1,293 @@
|
||||
|
@ -1554,7 +1554,7 @@ index 00000000..0b34e0d0
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
|
||||
new file mode 100644
|
||||
index 00000000..c0d8f201
|
||||
index 000000000..c0d8f2016
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
|
||||
@@ -0,0 +1,122 @@
|
||||
|
@ -1682,7 +1682,7 @@ index 00000000..c0d8f201
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
new file mode 100644
|
||||
index 00000000..5923adfe
|
||||
index 000000000..5923adfe6
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
@@ -0,0 +1,355 @@
|
||||
|
@ -2043,7 +2043,7 @@ index 00000000..5923adfe
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
|
||||
new file mode 100644
|
||||
index 00000000..ef824d70
|
||||
index 000000000..ef824d701
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsManager.java
|
||||
@@ -0,0 +1,188 @@
|
||||
|
@ -2237,7 +2237,7 @@ index 00000000..ef824d70
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
|
||||
new file mode 100644
|
||||
index 00000000..bf3e059f
|
||||
index 000000000..bf3e059fe
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
|
||||
@@ -0,0 +1,75 @@
|
||||
|
@ -2318,7 +2318,7 @@ index 00000000..bf3e059f
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..632c4961
|
||||
index 000000000..632c49615
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
|
||||
@@ -0,0 +1,53 @@
|
||||
|
@ -2377,7 +2377,7 @@ index 00000000..632c4961
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
|
||||
new file mode 100644
|
||||
index 00000000..80155072
|
||||
index 000000000..80155072d
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/Counter.java
|
||||
@@ -0,0 +1,38 @@
|
||||
|
@ -2421,7 +2421,7 @@ index 00000000..80155072
|
|||
+}
|
||||
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..190bf059
|
||||
index 000000000..190bf0598
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/JSONUtil.java
|
||||
@@ -0,0 +1,140 @@
|
||||
|
@ -2567,7 +2567,7 @@ index 00000000..190bf059
|
|||
+}
|
||||
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..63a899c7
|
||||
index 000000000..63a899c7d
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/LoadingIntMap.java
|
||||
@@ -0,0 +1,76 @@
|
||||
|
@ -2649,7 +2649,7 @@ index 00000000..63a899c7
|
|||
+}
|
||||
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..aedbb033
|
||||
index 000000000..aedbb0332
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/LoadingMap.java
|
||||
@@ -0,0 +1,368 @@
|
||||
|
@ -3023,7 +3023,7 @@ index 00000000..aedbb033
|
|||
+}
|
||||
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..5989ee21
|
||||
index 000000000..5989ee212
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/MRUMapCache.java
|
||||
@@ -0,0 +1,111 @@
|
||||
|
@ -3139,7 +3139,7 @@ index 00000000..5989ee21
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 0822b8e5..940c643d 100644
|
||||
index 0822b8e53..940c643df 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -574,7 +574,6 @@ public final class Bukkit {
|
||||
|
@ -3151,7 +3151,7 @@ index 0822b8e5..940c643d 100644
|
|||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 11c5c205..c197e381 100644
|
||||
index 11c5c2054..c197e3811 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1250,6 +1250,26 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
@ -3182,7 +3182,7 @@ index 11c5c205..c197e381 100644
|
|||
* Sends the component to the player
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
||||
index 247d194f..72c5501e 100644
|
||||
index 247d194f8..72c5501e8 100644
|
||||
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
||||
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
||||
@@ -69,4 +69,12 @@ public interface UnsafeValues {
|
||||
|
@ -3200,7 +3200,7 @@ index 247d194f..72c5501e 100644
|
|||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
|
||||
new file mode 100644
|
||||
index 00000000..f9a00aec
|
||||
index 000000000..f9a00aecc
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
|
||||
@@ -0,0 +1,21 @@
|
||||
|
@ -3226,7 +3226,7 @@ index 00000000..f9a00aec
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
|
||||
index 4bfc2146..03bdc162 100644
|
||||
index 4bfc21468..03bdc1622 100644
|
||||
--- a/src/main/java/org/bukkit/command/Command.java
|
||||
+++ b/src/main/java/org/bukkit/command/Command.java
|
||||
@@ -33,7 +33,8 @@ public abstract class Command {
|
||||
|
@ -3256,7 +3256,7 @@ index 4bfc2146..03bdc162 100644
|
|||
return true;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
||||
index d6c8938b..a6ad94ef 100644
|
||||
index d6c8938b1..a6ad94ef9 100644
|
||||
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
||||
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
||||
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
|
||||
|
@ -3280,7 +3280,7 @@ index d6c8938b..a6ad94ef 100644
|
|||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
|
||||
new file mode 100644
|
||||
index 00000000..ca1893e9
|
||||
index 000000000..ca1893e9f
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
|
||||
@@ -0,0 +1,114 @@
|
||||
|
@ -3399,7 +3399,7 @@ index 00000000..ca1893e9
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 81e4fa57..f020cb04 100644
|
||||
index 81e4fa573..f020cb04e 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
|
||||
|
@ -3456,7 +3456,7 @@ index 81e4fa57..f020cb04 100644
|
|||
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
|
||||
deleted file mode 100644
|
||||
index 6023e4f6..00000000
|
||||
index 6023e4f61..000000000
|
||||
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
|
||||
+++ /dev/null
|
||||
@@ -1,253 +0,0 @@
|
||||
|
@ -3714,10 +3714,10 @@ index 6023e4f6..00000000
|
|||
- // Spigot end
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 06762a69..4f8ae7a8 100644
|
||||
index fcf473396..8c3830cca 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1566,6 +1566,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1572,6 +1572,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
|
@ -3730,7 +3730,7 @@ index 06762a69..4f8ae7a8 100644
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index f648c598..78a2d2f8 100644
|
||||
index f648c5989..78a2d2f8d 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -297,7 +297,6 @@ public final class SimplePluginManager implements PluginManager {
|
||||
|
@ -3787,7 +3787,7 @@ index f648c598..78a2d2f8 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index 1173e433..82e379d1 100644
|
||||
index 1173e433a..82e379d16 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||
|
@ -3830,7 +3830,7 @@ index 1173e433..82e379d1 100644
|
|||
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
|
||||
} else {
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
index 0ffc1dfd..b859796b 100644
|
||||
index 0ffc1dfdb..b859796b4 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
@@ -24,7 +24,8 @@ import org.jetbrains.annotations.Nullable;
|
||||
|
@ -3844,7 +3844,7 @@ index 0ffc1dfd..b859796b 100644
|
|||
private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
|
||||
private final PluginDescriptionFile description;
|
||||
diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
|
||||
index 5ca863b3..612958a3 100644
|
||||
index 5ca863b36..612958a33 100644
|
||||
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
|
||||
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
|
||||
@@ -2,6 +2,7 @@ package org.bukkit.util;
|
||||
|
@ -3867,7 +3867,7 @@ index 5ca863b3..612958a3 100644
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
||||
index 6a8f7f55..3cbe5c2b 100644
|
||||
index b71235f69..3cbe5c2bb 100644
|
||||
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
||||
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
||||
@@ -1,3 +1,26 @@
|
||||
|
@ -3964,7 +3964,7 @@ index 6a8f7f55..3cbe5c2b 100644
|
|||
- /**
|
||||
- * Prints the timings and extra data to the given stream.
|
||||
- *
|
||||
- * @param printStream
|
||||
- * @param printStream output stream
|
||||
- */
|
||||
- public static void printTimings(@NotNull PrintStream printStream)
|
||||
- {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From cc1651a5c0a8d62c0fb1a29399db2b32c398c080 Mon Sep 17 00:00:00 2001
|
||||
From ff975211888a6278bff7825a05c0570c40a5572d Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Mon, 29 Feb 2016 17:22:34 -0600
|
||||
Subject: [PATCH] Player affects spawning API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 4f8ae7a8..329e2b01 100644
|
||||
index 8c3830cca..6568b179d 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1456,6 +1456,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1462,6 +1462,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@NotNull
|
||||
public String getLocale();
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 7b4710b297c3c73e4541edc5c71df4ccc6ca1fdd Mon Sep 17 00:00:00 2001
|
||||
From 18b67ec34070205553c5d37eb7fa10a49f8326e4 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Mon, 29 Feb 2016 18:05:37 -0600
|
||||
Subject: [PATCH] Add player view distance API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 329e2b01..145c78c2 100644
|
||||
index 6568b179d..338d47205 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1480,6 +1480,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1486,6 +1486,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
*/
|
||||
public void updateCommands();
|
||||
|
||||
|
|
|
@ -1,17 +1,25 @@
|
|||
From 7cad905e5bb7ed63e6c95e8032c94dbc627d0ef3 Mon Sep 17 00:00:00 2001
|
||||
From 6eb5b89c602482c737c039e182bca4b0f1031950 Mon Sep 17 00:00:00 2001
|
||||
From: mrapple <tony@oc.tc>
|
||||
Date: Sun, 25 Nov 2012 13:47:27 -0600
|
||||
Subject: [PATCH] Add methods for working with arrows stuck in living entities
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 2dbb81c1..a62f10e2 100644
|
||||
index e6249c2bf..2a4e4cb39 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -474,4 +474,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @return collision status
|
||||
@@ -476,6 +476,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
*/
|
||||
boolean isCollidable();
|
||||
|
||||
+<<<<<<< HEAD
|
||||
/**
|
||||
* Returns the value of the memory specified.
|
||||
* <p>
|
||||
@@ -500,4 +501,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @param <T> the type of the passed value
|
||||
*/
|
||||
<T> void setMemory(@NotNull MemoryKey<T> memoryKey, @Nullable T memoryValue);
|
||||
+
|
||||
+ // Paper start
|
||||
+ /**
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 2cfeb5e9e7efd65ad45b6155ce03e34197a25370 Mon Sep 17 00:00:00 2001
|
||||
From bd0e6228f445ce1b3e6dde9cba621e132eb3b4d2 Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Sat, 4 Apr 2015 22:59:54 -0400
|
||||
Subject: [PATCH] Complete resource pack API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index abe00d72..eb2e392d 100644
|
||||
index 0f7f25eb4..07ed02e8f 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1213,7 +1213,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
|
@ -18,7 +18,7 @@ index abe00d72..eb2e392d 100644
|
|||
public void setResourcePack(@NotNull String url);
|
||||
|
||||
/**
|
||||
@@ -1638,6 +1640,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1644,6 +1646,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
*/
|
||||
public void setViewDistance(int viewDistance);
|
||||
|
||||
|
@ -82,7 +82,7 @@ index abe00d72..eb2e392d 100644
|
|||
public class Spigot extends Entity.Spigot
|
||||
{
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
|
||||
index b9819565..4c2102a1 100644
|
||||
index b98195650..4c2102a11 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
|
||||
@@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From d094c6a2cdb1dba5073ba0a09f1cf523f06e2c47 Mon Sep 17 00:00:00 2001
|
||||
From fd66e162c93936eea057dc6cbed1ae4d82f93a0e Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 20 Dec 2016 15:55:55 -0500
|
||||
Subject: [PATCH] Add String based Action Bar API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index eb2e392d..27ecae8b 100644
|
||||
index 07ed02e8f..fe7827fda 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -424,6 +424,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
|
@ -47,7 +47,7 @@ index eb2e392d..27ecae8b 100644
|
|||
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
spigot().sendMessage(position, components);
|
||||
}
|
||||
@@ -1782,9 +1804,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1788,9 +1810,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
/**
|
||||
* Sends the component to the specified screen position of this player
|
||||
*
|
||||
|
@ -59,7 +59,7 @@ index eb2e392d..27ecae8b 100644
|
|||
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
@@ -1792,9 +1816,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1798,9 +1822,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
/**
|
||||
* Sends an array of components as a single message to the specified screen position of this player
|
||||
*
|
||||
|
|
|
@ -1,30 +1,15 @@
|
|||
From da832ecc767d55f84f4c25cd822496d474ca6077 Mon Sep 17 00:00:00 2001
|
||||
From f23f0d063ab357133aaa4eb44a040d87f50ba7eb 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 ffebffd8..f5e3929a 100644
|
||||
--- a/src/main/java/org/bukkit/NamespacedKey.java
|
||||
+++ b/src/main/java/org/bukkit/NamespacedKey.java
|
||||
@@ -39,8 +39,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 80608e7a..d8d42c84 100644
|
||||
index d1d64fb60..2fe46faf0 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -1656,6 +1656,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1657,6 +1657,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()}
|
||||
|
@ -32,7 +17,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
|
||||
|
||||
@@ -1671,6 +1672,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1673,6 +1674,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()}
|
||||
|
@ -40,7 +25,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
|
||||
|
||||
@@ -1720,6 +1722,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1723,6 +1725,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()}
|
||||
|
@ -48,7 +33,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
||||
|
||||
@@ -1739,6 +1742,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1743,6 +1746,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()}
|
||||
|
@ -56,7 +41,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
||||
|
||||
@@ -1794,6 +1798,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1799,6 +1803,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()}
|
||||
|
@ -64,7 +49,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
||||
|
||||
@@ -1815,6 +1820,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1821,6 +1826,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()}
|
||||
|
@ -72,7 +57,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
||||
|
||||
@@ -1837,6 +1843,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1844,6 +1850,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* @param force whether to send the particle to players within an extended
|
||||
* range and encourage their client to render it regardless of
|
||||
* settings
|
||||
|
@ -80,7 +65,7 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
|
||||
|
||||
@@ -1861,6 +1868,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1869,6 +1876,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* @param force whether to send the particle to players within an extended
|
||||
* range and encourage their client to render it regardless of
|
||||
* settings
|
||||
|
@ -88,24 +73,11 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
index 2f195672..234aa9dd 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
@@ -25,7 +25,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/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
index 290aff28..9fd54b96 100644
|
||||
index c2096b534..bca9d3659 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
@@ -141,6 +141,7 @@ public interface AreaEffectCloud extends Entity {
|
||||
@@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity {
|
||||
* @param particle the new particle type
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -113,34 +85,8 @@ index 290aff28..9fd54b96 100644
|
|||
*/
|
||||
<T> void setParticle(@NotNull Particle particle, @Nullable T data);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
|
||||
index 5d9698dc..2c56eb85 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 734f5ac7..5efa4e60 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Horse.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Horse.java
|
||||
@@ -154,7 +154,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 27ecae8b..c30f9791 100644
|
||||
index fe7827fda..290b9d75d 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -439,7 +439,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
|
@ -184,7 +130,7 @@ index 27ecae8b..c30f9791 100644
|
|||
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -1429,6 +1433,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1430,6 +1434,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @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()}
|
||||
|
@ -192,7 +138,7 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
|
||||
|
||||
@@ -1444,6 +1449,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1446,6 +1451,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @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()}
|
||||
|
@ -200,7 +146,7 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
|
||||
|
||||
@@ -1493,6 +1499,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1496,6 +1502,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @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()}
|
||||
|
@ -208,7 +154,7 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
||||
|
||||
@@ -1512,6 +1519,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1516,6 +1523,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @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()}
|
||||
|
@ -216,7 +162,7 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
||||
|
||||
@@ -1567,6 +1575,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1572,6 +1580,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* particle used (normally speed)
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -224,7 +170,7 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
||||
|
||||
@@ -1588,6 +1597,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1594,6 +1603,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* particle used (normally speed)
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -232,62 +178,8 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
index 2a0b0109..2ac30c0f 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
@@ -19,6 +19,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 756f285e..ee2e70c6 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Zombie.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Zombie.java
|
||||
@@ -32,7 +32,7 @@ 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
|
||||
@@ -40,7 +40,7 @@ public interface Zombie extends Monster {
|
||||
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 1ca8de5e..0dba5d01 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
@@ -28,6 +28,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(@NotNull final Player player, @NotNull final String hostname, @NotNull final InetAddress address, final @NotNull InetAddress realAddress) { // Spigot
|
||||
super(player);
|
||||
@@ -51,6 +52,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(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final String message, @NotNull final InetAddress realAddress) { // Spigot
|
||||
this(player, hostname, address, realAddress); // Spigot
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
||||
index 1b2267f4..1a58734d 100644
|
||||
index 1b2267f4e..1a58734d9 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
||||
@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
|
||||
|
@ -299,101 +191,6 @@ index 1b2267f4..1a58734d 100644
|
|||
public Location getTo() {
|
||||
return to;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
index 07d2b4cf..cbcbe8c8 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
@@ -132,10 +132,10 @@ public interface ItemFactory {
|
||||
* Apply a material change for an item meta. Do not use under any
|
||||
* circumstances.
|
||||
*
|
||||
- * @param meta
|
||||
- * @param material
|
||||
+ * @param meta meta
|
||||
+ * @param material material
|
||||
* @return updated material
|
||||
- * @throws IllegalArgumentException
|
||||
+ * @throws IllegalArgumentException exception
|
||||
* @deprecated for internal use only
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
index ab2b5958..4b0aef05 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
@@ -34,7 +34,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
|
||||
*/
|
||||
@NotNull
|
||||
MerchantRecipe getRecipe(int i) throws IndexOutOfBoundsException;
|
||||
@@ -44,7 +44,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, @NotNull 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 57d893a4..77846f32 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 91ddadbb..d21f407c 100644
|
||||
--- a/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
+++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
@@ -37,6 +37,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
|
||||
*/
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
|
||||
index 1952dd9c..8b2e3439 100644
|
||||
--- a/src/main/java/org/bukkit/potion/PotionType.java
|
||||
+++ b/src/main/java/org/bukkit/potion/PotionType.java
|
||||
@@ -72,6 +72,7 @@ public enum PotionType {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @return Damage value associated with this PotionType, broken
|
||||
* @deprecated Non-functional
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -84,6 +85,8 @@ public enum PotionType {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @param damage Damage value associated with a PotionType
|
||||
+ * @return PotionType for given damage value, broken
|
||||
* @deprecated Non-functional
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -94,6 +97,8 @@ public enum PotionType {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @param effectType EffectType
|
||||
+ * @return Associated PotionType
|
||||
* @deprecated Misleading
|
||||
*/
|
||||
@Deprecated
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ab9a652b2d9f9d0d0e9015a631a77e61a42499b6 Mon Sep 17 00:00:00 2001
|
||||
From 7f8b71c8dd1d8cd60348ee5bedcb155a6ed92c55 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Mon, 31 Jul 2017 01:49:43 -0500
|
||||
Subject: [PATCH] LivingEntity#setKiller
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index ab666fb9..49c79028 100644
|
||||
index 2a4e4cb39..ba7881a27 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -249,6 +249,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@Nullable
|
||||
public Player getKiller();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 088273d7cf7bf3be282254a2ba7686fbf9648ea0 Mon Sep 17 00:00:00 2001
|
||||
From f31c5a5d3b3ac8b24e723d53ddee127d6f6260be Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 18 Mar 2018 12:28:55 -0400
|
||||
Subject: [PATCH] Player.setPlayerProfile API
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
|
|||
This can be useful for changing name or skins after a player has logged in.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index df1d3c78..8f87b165 100644
|
||||
index 7d6cfb05d..ff799ac78 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3,6 +3,7 @@ package org.bukkit.entity;
|
||||
|
@ -17,7 +17,7 @@ index df1d3c78..8f87b165 100644
|
|||
import org.bukkit.Achievement;
|
||||
import org.bukkit.Effect;
|
||||
import org.bukkit.GameMode;
|
||||
@@ -1747,6 +1748,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1753,6 +1754,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
|
||||
*/
|
||||
boolean hasResourcePack();
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ca26d707e4e2751c7adfdd7069089403b940fddd Mon Sep 17 00:00:00 2001
|
||||
From 3f6946a1734c78e66bc72254d58abd3fee9bbb88 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 29 Aug 2017 23:58:48 -0400
|
||||
Subject: [PATCH] Expand World.spawnParticle API and add Builder
|
||||
|
@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
|
||||
new file mode 100644
|
||||
index 00000000..06f1602f
|
||||
index 000000000..06f1602f5
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
|
||||
@@ -0,0 +1,478 @@
|
||||
|
@ -493,7 +493,7 @@ index 00000000..06f1602f
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
|
||||
index 68cb7442..69aae30a 100644
|
||||
index 68cb74420..69aae30a3 100644
|
||||
--- a/src/main/java/org/bukkit/Particle.java
|
||||
+++ b/src/main/java/org/bukkit/Particle.java
|
||||
@@ -92,6 +92,17 @@ public enum Particle {
|
||||
|
@ -515,10 +515,10 @@ index 68cb7442..69aae30a 100644
|
|||
* Options which can be applied to redstone dust particles - a particle
|
||||
* color and size.
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index bcf5f8aa..28afb932 100644
|
||||
index e1e674bab..fbd61137d 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -2075,7 +2075,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -2081,7 +2081,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
* @param <T> Type
|
||||
*/
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 59f80990fb5676b49a1361460acc7b6e3d0e1842 Mon Sep 17 00:00:00 2001
|
||||
From 397522a209a9ca5af469a8c11502d0354df6bed1 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 16 Jun 2018 01:17:39 -0500
|
||||
Subject: [PATCH] Make shield blocking delay configurable
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 5ca11bb9..bf5d3096 100644
|
||||
index ba7881a27..a663d7ab1 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -497,5 +497,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -524,5 +524,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @param arrows Number of arrows to stick in this entity
|
||||
*/
|
||||
void setArrowsStuck(int arrows);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b6f3ff57144a35d024fca8213f71837add1b235e Mon Sep 17 00:00:00 2001
|
||||
From b4f1678a42edf3bf41e4e2659b68a0c2be2e66e8 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 29 Jun 2018 00:19:19 -0400
|
||||
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
|
||||
|
@ -6,18 +6,18 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
|
|||
How long an entity has raised hands to charge an attack or use an item
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index bf5d3096..7322bf6d 100644
|
||||
index a663d7ab1..adae86709 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -10,6 +10,7 @@ import org.bukkit.World;
|
||||
import org.bukkit.attribute.Attributable;
|
||||
@@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.memory.MemoryKey;
|
||||
import org.bukkit.inventory.EntityEquipment;
|
||||
+import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
import org.bukkit.projectiles.ProjectileSource;
|
||||
@@ -511,5 +512,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -538,5 +539,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @param delay Delay in ticks
|
||||
*/
|
||||
void setShieldBlockingDelay(int delay);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From be370e286edf69f7b99b9822bf91d53303dbda39 Mon Sep 17 00:00:00 2001
|
||||
From 6c38f7533ba57e7f607e6552cb73b62714eba0b3 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Mon, 3 Sep 2018 18:13:53 -0500
|
||||
Subject: [PATCH] Add ray tracing methods to LivingEntity
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
|
||||
new file mode 100644
|
||||
index 00000000..18a96dbb
|
||||
index 000000000..18a96dbb0
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
|
||||
@@ -0,0 +1,54 @@
|
||||
|
@ -65,10 +65,10 @@ index 00000000..18a96dbb
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 95567daa..75761f2d 100644
|
||||
index adae86709..6b2002ceb 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -80,6 +80,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@NotNull
|
||||
public Block getTargetBlock(@Nullable Set<Material> transparent, int maxDistance);
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From fba7db1aa8b007220c83722f68f22983be3dd7de Mon Sep 17 00:00:00 2001
|
||||
From 6e59b914fe8eb9eaed067387f9c727536e429b23 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Tue, 4 Sep 2018 15:01:54 -0500
|
||||
Subject: [PATCH] Expose attack cooldown methods for Player
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 214fe2d9..024528ba 100644
|
||||
index 32dc1f868..dea6130a6 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1923,6 +1923,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1929,6 +1929,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @param profile The new profile to use
|
||||
*/
|
||||
void setPlayerProfile(@NotNull PlayerProfile profile);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e7febe25992426125545ed3cee761b525a8231c3 Mon Sep 17 00:00:00 2001
|
||||
From ff3cac69313d04099bc0005676832b9b92d7fb5e Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 22 Sep 2018 00:32:53 -0500
|
||||
Subject: [PATCH] Add LivingEntity#getTargetEntity
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
|
||||
new file mode 100644
|
||||
index 00000000..f52644fa
|
||||
index 000000000..f52644fab
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
|
||||
@@ -0,0 +1,38 @@
|
||||
|
@ -49,10 +49,10 @@ index 00000000..f52644fa
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 75761f2d..7f3c0a6e 100644
|
||||
index 6b2002ceb..757cc5826 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -149,6 +149,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
*/
|
||||
@Nullable
|
||||
public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 67b6e8b2a250f63b27cc203cd31f6e09e12d265a Mon Sep 17 00:00:00 2001
|
||||
From 08595b0bf9dcd0fbeb11f467ff604ae052e1418c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 24 Mar 2019 18:44:26 -0400
|
||||
Subject: [PATCH] Ignore package-private methods for nullability annotations
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations
|
|||
This isn't API
|
||||
|
||||
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
|
||||
index 596f2807..cdc0afc0 100644
|
||||
index 328a5a163..af2abd47f 100644
|
||||
--- a/src/test/java/org/bukkit/AnnotationTest.java
|
||||
+++ b/src/test/java/org/bukkit/AnnotationTest.java
|
||||
@@ -163,7 +163,7 @@ public class AnnotationTest {
|
||||
@@ -162,7 +162,7 @@ public class AnnotationTest {
|
||||
|
||||
private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
|
||||
// Exclude private, synthetic and deprecated methods
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue