Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Initial work on 1.14 pre-5

Browse Source
This commit is contained in:
Shane Freeder 2019-04-23 05:47:07 +01:00
parent fb25dc17c6
commit 6c3f04049d
315 changed files with 1547 additions and 1648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 16f2fa8f86ea4272386830faf08c84cde635a753 Mon Sep 17 00:00:00 2001
From 37ba5cd5b415edd8e09513708652069efc410ddf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index b3369ecf..c2ec40c7 100644
index 4118252f..0a61b4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,33 +3,28 @@
@@ -3,33 +3,29 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@ -20,8 +20,9 @@ index b3369ecf..c2ec40c7 100644
+ <version>dev-SNAPSHOT</version>
+ </parent>
+
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
<version>1.14-pre5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -55,7 +56,7 @@ index b3369ecf..c2ec40c7 100644
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -41,6 +36,10 @@
@@ -41,6 +37,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@ -66,8 +67,8 @@ index b3369ecf..c2ec40c7 100644
</repositories>
<pluginRepositories>
@@ -63,6 +62,13 @@
<version>1.1.1</version>
@@ -57,6 +57,20 @@
<version>2.6</version>
<scope>compile</scope>
</dependency>
+ <!-- bundled with Minecraft, shouldn't ever change -->
@ -76,11 +77,18 @@ index b3369ecf..c2ec40c7 100644
+ <artifactId>jsr305</artifactId>
+ <version>1.3.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- used in previous versions of the API -->
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -119,15 +125,12 @@
@@ -113,15 +127,12 @@
</dependencies>
<build>
@ -97,7 +105,7 @@ index b3369ecf..c2ec40c7 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -162,6 +165,7 @@
@@ -156,6 +167,7 @@
</execution>
</executions>
<configuration>

8
Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
View File

@ -1,4 +1,4 @@
From af5c59b98dedbd732043a1f9155a94fb96158383 Mon Sep 17 00:00:00 2001
From 38757c176090c45b72d90314edbd83d5be3cdffb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] Add FastUtil to Bukkit
@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
Doesn't expose to plugins, just allows Paper-API to use it for optimization
diff --git a/pom.xml b/pom.xml
index a613cf963..f8f12595b 100644
index 2e261925..545af460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,12 @@
@@ -51,6 +51,12 @@
</pluginRepositories>
<dependencies>
@ -23,5 +23,5 @@ index a613cf963..f8f12595b 100644
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
--
2.20.1
2.21.0

4
Spigot-API-Patches/0003-Paper-Utils.patch
View File

@ -1,4 +1,4 @@
From e7c9d3dadf38b1314ad78cce03635eec74035855 Mon Sep 17 00:00:00 2001
From 291dddb5395e33cdfdc58142296dcc5e8aba73f0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 23 Feb 2019 11:26:21 -0500
Subject: [PATCH] Paper Utils
@ -6,7 +6,7 @@ Subject: [PATCH] Paper Utils
diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
new file mode 100644
index 000000000..9db0056ab
index 00000000..9db0056a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
@@ -0,0 +1,16 @@

114
Spigot-API-Patches/0004-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From eb2e4ca41e4f961fedc2ff7a79ce3031e50d2d07 Mon Sep 17 00:00:00 2001
From cf5ea1965af71c23c2baae43f99cabd273c82291 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
@ -3139,10 +3139,28 @@ index 00000000..5989ee21
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a3c4b148..7e416f08 100644
index 1c1f650d..d2e47a35 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -602,7 +602,6 @@ public final class Bukkit {
@@ -189,6 +189,17 @@ public final class Bukkit {
return server.getIp();
}
+ // Paper start - bring back server name
+ /**
+ * Get the name of this server
+ * @return the name of the server
+ */
+ @NotNull
+ public static String getServerName() {
+ return server.getServerName();
+ }
+ // Paper
+
/**
* Get world type (level-type setting) for default world.
*
@@ -574,7 +585,6 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -3151,10 +3169,26 @@ index a3c4b148..7e416f08 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2767f4e5..5b5a3bc5 100644
index 2a55a954..77d993ad 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1276,6 +1276,26 @@ public interface Server extends PluginMessageRecipient {
@@ -158,6 +158,15 @@ public interface Server extends PluginMessageRecipient {
@NotNull
public String getIp();
+ // Paper start - bring back server name
+ /**
+ * Get the name of this server
+ * @return the name of the server
+ */
+ @NotNull
+ public String getServerName();
+ // Paper
+
/**
* Get world type (level-type setting) for default world.
*
@@ -1252,6 +1261,26 @@ public interface Server extends PluginMessageRecipient {
throw new UnsupportedOperationException( "Not supported yet." );
}
@ -3209,10 +3243,10 @@ index 00000000..f9a00aec
+ }
+}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index dafc4ed9..c2c19ed4 100644
index 4bfc2146..03bdc162 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -35,7 +35,8 @@ public abstract class Command {
@@ -33,7 +33,8 @@ public abstract class Command {
protected String usageMessage;
private String permission;
private String permissionMessage;
@ -3222,7 +3256,7 @@ index dafc4ed9..c2c19ed4 100644
protected Command(@NotNull String name) {
this(name, "", "/" + name, new ArrayList<String>());
@@ -49,7 +50,6 @@ public abstract class Command {
@@ -47,7 +48,6 @@ public abstract class Command {
this.usageMessage = (usageMessage == null) ? "/" + name : usageMessage;
this.aliases = aliases;
this.activeAliases = new ArrayList<String>(aliases);
@ -3230,7 +3264,7 @@ index dafc4ed9..c2c19ed4 100644
}
/**
@@ -247,7 +247,6 @@ public abstract class Command {
@@ -245,7 +245,6 @@ public abstract class Command {
}
this.nextLabel = name;
if (!isRegistered()) {
@ -3239,10 +3273,10 @@ index dafc4ed9..c2c19ed4 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 2035880e..b8c97a4b 100644
index d6c8938b..a6ad94ef 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -10,6 +10,7 @@ public class FormattedCommandAlias extends Command {
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
public FormattedCommandAlias(@NotNull String alias, @NotNull String[] formatStrings) {
super(alias);
@ -3250,7 +3284,7 @@ index 2035880e..b8c97a4b 100644
this.formatStrings = formatStrings;
}
@@ -114,6 +115,10 @@ public class FormattedCommandAlias extends Command {
@@ -113,6 +114,10 @@ public class FormattedCommandAlias extends Command {
return formatString;
}
@ -3382,10 +3416,18 @@ index 00000000..ca1893e9
+
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 1586f648..6a786b8c 100644
index b3d5a302..9d0ae63f 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
import org.bukkit.command.defaults.HelpCommand;
import org.bukkit.command.defaults.PluginsCommand;
import org.bukkit.command.defaults.ReloadCommand;
-import org.bukkit.command.defaults.TimingsCommand;
import org.bukkit.command.defaults.VersionCommand;
import org.bukkit.entity.Player;
import org.bukkit.util.StringUtil;
@@ -35,7 +34,7 @@ public class SimpleCommandMap implements CommandMap {
register("bukkit", new VersionCommand("version"));
register("bukkit", new ReloadCommand("reload"));
register("bukkit", new PluginsCommand("plugins"));
@ -3394,7 +3436,7 @@ index 1586f648..6a786b8c 100644
}
public void setFallbackCommands() {
@@ -60,6 +60,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -64,6 +63,7 @@ public class SimpleCommandMap implements CommandMap {
* {@inheritDoc}
*/
public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) {
@ -3402,7 +3444,7 @@ index 1586f648..6a786b8c 100644
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
boolean registered = register(label, command, false, fallbackPrefix);
@@ -135,16 +136,22 @@ public class SimpleCommandMap implements CommandMap {
@@ -139,16 +139,22 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
@ -3431,18 +3473,18 @@ index 1586f648..6a786b8c 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 1e6e7033..00000000
index 6023e4f6..00000000
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ /dev/null
@@ -1,255 +0,0 @@
@@ -1,253 +0,0 @@
-package org.bukkit.command.defaults;
-
-import com.google.common.collect.ImmutableList;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.Validate;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
@ -3453,21 +3495,19 @@ index 1e6e7033..00000000
-import org.bukkit.plugin.RegisteredListener;
-import org.bukkit.plugin.TimedRegisteredListener;
-import org.bukkit.util.StringUtil;
-
-import com.google.common.collect.ImmutableList;
-import org.jetbrains.annotations.NotNull;
-
-// Spigot start
-// CHECKSTYLE:OFF
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.logging.Level;
-
-import org.bukkit.command.RemoteConsoleCommandSender;
-import org.bukkit.plugin.SimplePluginManager;
-import org.spigotmc.CustomTimingsHandler;
-// CHECKSTYLE:ON
-// Spigot end
-
-public class TimingsCommand extends BukkitCommand {
@ -3691,10 +3731,10 @@ index 1e6e7033..00000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 97504e6f..777994f7 100644
index 36a42a80..942cb386 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
@@ -1565,6 +1565,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.");
}
@ -3707,10 +3747,10 @@ index 97504e6f..777994f7 100644
@NotNull
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 76137a80..fe572551 100644
index 17ddbe61..47327376 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 {
@@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -3718,7 +3758,7 @@ index 76137a80..fe572551 100644
return result.toArray(new Plugin[result.size()]);
}
@@ -335,7 +334,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -333,7 +332,7 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
@ -3727,7 +3767,7 @@ index 76137a80..fe572551 100644
}
return result;
@@ -362,7 +361,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -360,7 +359,7 @@ public final class SimplePluginManager implements PluginManager {
*/
@Nullable
public synchronized Plugin getPlugin(@NotNull String name) {
@ -3736,7 +3776,7 @@ index 76137a80..fe572551 100644
}
@NotNull
@@ -561,7 +560,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -562,7 +561,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@ -3746,7 +3786,7 @@ index 76137a80..fe572551 100644
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -744,7 +744,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -745,7 +745,7 @@ public final class SimplePluginManager implements PluginManager {
}
public boolean useTimings() {
@ -3755,7 +3795,7 @@ index 76137a80..fe572551 100644
}
/**
@@ -753,6 +753,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -754,6 +754,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
@ -3764,10 +3804,10 @@ index 76137a80..fe572551 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 56f93336..5b29076f 100644
index 92983c1e..2618906f 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -54,7 +54,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
@ -3775,7 +3815,7 @@ index 56f93336..5b29076f 100644
/**
* This class was not meant to be constructed explicitly
@@ -299,26 +298,20 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -298,26 +297,20 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -3806,10 +3846,10 @@ index 56f93336..5b29076f 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 541d8ee6..c39fcac5 100644
index 0ffc1dfd..b859796b 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -25,7 +25,8 @@ import org.jetbrains.annotations.Nullable;
@@ -24,7 +24,8 @@ import org.jetbrains.annotations.Nullable;
/**
* A ClassLoader for plugins, to allow shared classes across multiple plugins
*/

6
Spigot-API-Patches/0005-Player-affects-spawning-API.patch
View File

@ -1,14 +1,14 @@
From 3fbe48f546b9da11b1e6baa07d639960dd30a9dc Mon Sep 17 00:00:00 2001
From 2c1d58ff26be1c6623cbd2f598a03405037f262c 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 777994f7..95ebf016 100644
index 942cb386..ca0dda5a 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
@@ -1455,6 +1455,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@NotNull
public String getLocale();

12
Spigot-API-Patches/0006-Add-getTPS-method.patch
View File

@ -1,14 +1,14 @@
From 73ffeed771aad1a3dd6af47de0875a4b20900ef7 Mon Sep 17 00:00:00 2001
From f6ba024fcfe38fcdb7c7f5f122e26e3aa3beddba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index cffa0c65..2ad9a7d7 100644
index d2e47a35..97ec6c53 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1341,6 +1341,17 @@ public final class Bukkit {
@@ -1324,6 +1324,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -27,10 +27,10 @@ index cffa0c65..2ad9a7d7 100644
* Get the advancement specified by this key.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9f7f760a..3ad70b92 100644
index 77d993ad..c94c5d90 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1122,6 +1122,16 @@ public interface Server extends PluginMessageRecipient {
@@ -1107,6 +1107,16 @@ public interface Server extends PluginMessageRecipient {
@Nullable
Entity getEntity(@NotNull UUID uuid);
@ -48,5 +48,5 @@ index 9f7f760a..3ad70b92 100644
* Get the advancement specified by this key.
*
--
2.17.1
2.21.0

10
Spigot-API-Patches/0007-Entity-Origin-API.patch
View File

@ -1,14 +1,14 @@
From f58b39ec3dd2e77e684740b2ea13bc7d1aaecef8 Mon Sep 17 00:00:00 2001
From cd87ab89a8a26d08b1af14028c1040a8e78695dc Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9f12a1920..b4df9b779 100644
index f948f1fc..fa7ab5af 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -593,4 +593,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -592,4 +592,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot end
@ -26,7 +26,7 @@ index 9f12a1920..b4df9b779 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
index 64f9d3fd8..14cb0d770 100644
index 64f9d3fd..14cb0d77 100644
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
@@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
@ -46,7 +46,7 @@ index 64f9d3fd8..14cb0d770 100644
+ }
}
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
index 5a8789324..3022b4a27 100644
index 5a878932..3022b4a2 100644
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
@@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive {

16
Spigot-API-Patches/0008-Check-Paper-versions.patch
View File

@ -1,15 +1,15 @@
From 1bc123f10d8aefd48085360b80c7daee9945ec04 Mon Sep 17 00:00:00 2001
From c95ac122794bd807e5332c5f847746209cb18a7a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:58:01 -0600
Subject: [PATCH] Check Paper versions
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index b8126985d..73d258763 100644
index cbce5244..5a1f9504 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -28,6 +28,14 @@ import java.util.concurrent.locks.ReentrantLock;
@@ -25,6 +25,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.util.StringUtil;
import org.jetbrains.annotations.NotNull;
+// Paper start
@ -23,7 +23,7 @@ index b8126985d..73d258763 100644
public class VersionCommand extends BukkitCommand {
public VersionCommand(@NotNull String name) {
super(name);
@@ -153,7 +161,7 @@ public class VersionCommand extends BukkitCommand {
@@ -150,7 +158,7 @@ public class VersionCommand extends BukkitCommand {
private void sendVersion(@NotNull CommandSender sender) {
if (hasVersion) {
@ -32,7 +32,7 @@ index b8126985d..73d258763 100644
lastCheck = System.currentTimeMillis();
hasVersion = false;
} else {
@@ -184,24 +192,28 @@ public class VersionCommand extends BukkitCommand {
@@ -181,24 +189,28 @@ public class VersionCommand extends BukkitCommand {
}
}
@ -73,7 +73,7 @@ index b8126985d..73d258763 100644
version = version.substring("git-Bukkit-".length());
int cbVersions = getDistance("craftbukkit", version.substring(0, version.indexOf(' ')));
if (cbVersions == -1) {
@@ -234,8 +246,16 @@ public class VersionCommand extends BukkitCommand {
@@ -231,8 +243,16 @@ public class VersionCommand extends BukkitCommand {
}
}
@ -91,7 +91,7 @@ index b8126985d..73d258763 100644
BufferedReader reader = Resources.asCharSource(
new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
Charsets.UTF_8
@@ -249,9 +269,57 @@ public class VersionCommand extends BukkitCommand {
@@ -246,9 +266,57 @@ public class VersionCommand extends BukkitCommand {
} finally {
reader.close();
}

4
Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
View File

@ -1,4 +1,4 @@
From 4a87891b85650f57eb21334774f829ae8ba4c5e0 Mon Sep 17 00:00:00 2001
From 9a6838df086b3cfe02bc73770d02dffc80458b6e Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Mon, 29 Feb 2016 18:02:25 -0600
Subject: [PATCH] Add PlayerLocaleChangeEvent
@ -61,5 +61,5 @@ index 00000000..29dd763a
+ }
+}
--
2.20.1
2.21.0

6
Spigot-API-Patches/0010-Add-player-view-distance-API.patch
View File

@ -1,14 +1,14 @@
From 331efa882680033d3d69d00d3717886572cf5051 Mon Sep 17 00:00:00 2001
From d04309c257669a7340b21f6947b503d54069c9a1 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 95ebf016..51a145a4 100644
index ca0dda5a..801c7f01 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
@@ -1479,6 +1479,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void updateCommands();

4
Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
View File

@ -1,4 +1,4 @@
From 187c890c4b97f0664edd8959a7dd28e30ad611d4 Mon Sep 17 00:00:00 2001
From 0d98bd24755cdde12f818cae59c8fd062416f45a Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 18:09:40 -0600
Subject: [PATCH] Add BeaconEffectEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
new file mode 100644
index 000000000..978813b94
index 00000000..978813b9
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
@@ -0,0 +1,86 @@

4
Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From 29f3d0354d4a1dd627e60c82bd78e01655df4dc3 Mon Sep 17 00:00:00 2001
From 7e4486b3102224a0c88366432cac3e6ef83bbd71 Mon Sep 17 00:00:00 2001
From: Steve Anton <anxuiz.nx@gmail.com>
Date: Mon, 29 Feb 2016 18:13:58 -0600
Subject: [PATCH] Add PlayerInitialSpawnEvent
@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
new file mode 100644
index 000000000..8e407eff1
index 00000000..8e407eff
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
@@ -0,0 +1,47 @@

6
Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
View File

@ -1,14 +1,14 @@
From 42102ce2e5ad6be437319492744160cde67deed9 Mon Sep 17 00:00:00 2001
From 30d7c520cf0004c8629f7c085639785bb5d32146 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 19:45:21 -0600
Subject: [PATCH] Automatically disable plugins that fail to load
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 5b29076f..ac0702df 100644
index 2618906f..85139364 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -340,6 +340,10 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -339,6 +339,10 @@ public final class JavaPluginLoader implements PluginLoader {
jPlugin.setEnabled(true);
} catch (Throwable ex) {
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);

10
Spigot-API-Patches/0014-Expose-server-CommandMap.patch
View File

@ -1,14 +1,14 @@
From 484c707cb1f0be319fae942a8e5fe950a9cdb409 Mon Sep 17 00:00:00 2001
From d601b47efb8159c2a7493e065a32ea52e14d1566 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index c1e2c13c..a887f3a4 100644
index 97ec6c53..218f5fc9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1515,6 +1515,19 @@ public final class Bukkit {
@@ -1498,6 +1498,19 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -29,10 +29,10 @@ index c1e2c13c..a887f3a4 100644
public static Server.Spigot spigot()
{
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 609b818b..145f6df7 100644
index c94c5d90..c5435c42 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1132,6 +1132,15 @@ public interface Server extends PluginMessageRecipient {
@@ -1117,6 +1117,15 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end

14
Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View File

@ -1,4 +1,4 @@
From 6bc816b2ea026b0d07a19fa4bb3453c03ed421e6 Mon Sep 17 00:00:00 2001
From 2221f63255840589b9c788e76bdac17218a66549 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
Change Javadoc to be accurate
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3a80f2e29..e27bdb7bf 100644
index 218f5fc9..184c024d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -302,6 +302,26 @@ public final class Bukkit {
@@ -285,6 +285,26 @@ public final class Bukkit {
return server.broadcastMessage(message);
}
@ -37,10 +37,10 @@ index 3a80f2e29..e27bdb7bf 100644
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4c3156071..ab0438b81 100644
index c5435c42..246e081b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -249,6 +249,26 @@ public interface Server extends PluginMessageRecipient {
@@ -234,6 +234,26 @@ public interface Server extends PluginMessageRecipient {
*/
public int broadcastMessage(@NotNull String message);
@ -68,10 +68,10 @@ index 4c3156071..ab0438b81 100644
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 51a145a4a..5a741b41e 100644
index 801c7f01..fd88fd65 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -421,6 +421,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -420,6 +420,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(@NotNull MapView map);

13
Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
View File

@ -1,4 +1,4 @@
From cc380b206c9722db4792168359563441f224663a Mon Sep 17 00:00:00 2001
From 1277d8b62c6c49ac4a32c7c5e0695b2f35e7aee8 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 000000000..4fe18540f
index 00000000..4fe18540
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/Title.java
@@ -0,0 +1,373 @@
@ -384,18 +384,19 @@ index 000000000..4fe18540f
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5a741b41e..1de43bd33 100644
index fd88fd65..1de43bd3 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;
@@ -1,6 +1,8 @@
package org.bukkit.entity;
import java.net.InetSocketAddress;
+
+import com.destroystokyo.paper.Title;
import org.bukkit.Achievement;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -451,6 +452,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -450,6 +452,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}

46
Spigot-API-Patches/0017-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From e1e05e05e79b9ba25d403b5648b57c59b1c622cf Mon Sep 17 00:00:00 2001
From d8a7d90df073f104820ab655dcf7d682a993361c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
new file mode 100644
index 000000000..d3b00f741
index 00000000..d3b00f74
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
@@ -0,0 +1,41 @@
@ -53,7 +53,7 @@ index 000000000..d3b00f741
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
new file mode 100644
index 000000000..6fb39af04
index 00000000..6fb39af0
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
@@ -0,0 +1,64 @@
@ -123,7 +123,7 @@ index 000000000..6fb39af04
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
new file mode 100644
index 000000000..410b24139
index 00000000..410b2413
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
@@ -0,0 +1,52 @@
@ -181,7 +181,7 @@ index 000000000..410b24139
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
new file mode 100644
index 000000000..c06ea3942
index 00000000..c06ea394
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
@@ -0,0 +1,23 @@
@ -210,7 +210,7 @@ index 000000000..c06ea3942
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
new file mode 100644
index 000000000..e762ed0db
index 00000000..e762ed0d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
@@ -0,0 +1,35 @@
@ -251,7 +251,7 @@ index 000000000..e762ed0db
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
new file mode 100644
index 000000000..f016ba3b1
index 00000000..f016ba3b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
@@ -0,0 +1,20 @@
@ -278,7 +278,7 @@ index 000000000..f016ba3b1
\ No newline at end of file
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
new file mode 100644
index 000000000..6defac287
index 00000000..6defac28
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
@@ -0,0 +1,38 @@
@ -322,7 +322,7 @@ index 000000000..6defac287
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
new file mode 100644
index 000000000..89e132525
index 00000000..89e13252
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
@@ -0,0 +1,64 @@
@ -392,7 +392,7 @@ index 000000000..89e132525
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
new file mode 100644
index 000000000..2d0b2d4a9
index 00000000..2d0b2d4a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
@@ -0,0 +1,37 @@
@ -435,7 +435,7 @@ index 000000000..2d0b2d4a9
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
new file mode 100644
index 000000000..5582999fe
index 00000000..5582999f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
@@ -0,0 +1,22 @@
@ -462,20 +462,21 @@ index 000000000..5582999fe
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 6a786b8c5..682d27f94 100644
index 9d0ae63f..911d90fd 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -9,6 +9,9 @@ import java.util.Iterator;
@@ -8,6 +8,10 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
+import com.destroystokyo.paper.exception.ServerCommandException;
+import com.destroystokyo.paper.exception.ServerTabCompleteException;
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -148,11 +151,14 @@ public class SimpleCommandMap implements CommandMap {
@@ -151,11 +155,14 @@ public class SimpleCommandMap implements CommandMap {
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
} // target.timings.stopTiming(); // Spigot // Paper
} catch (CommandException ex) {
@ -491,7 +492,7 @@ index 6a786b8c5..682d27f94 100644
}
// return true as command was handled
@@ -227,7 +233,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -230,7 +237,9 @@ public class SimpleCommandMap implements CommandMap {
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
@ -503,20 +504,21 @@ index 6a786b8c5..682d27f94 100644
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index fe5725519..4c55f5f8c 100644
index 47327376..ef38b2af 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -19,6 +19,9 @@ import java.util.logging.Level;
@@ -19,6 +19,10 @@ import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
+import com.destroystokyo.paper.exception.ServerEventException;
+import com.destroystokyo.paper.exception.ServerPluginEnableDisableException;
import org.apache.commons.lang.Validate;
import org.bukkit.Server;
import org.bukkit.command.Command;
@@ -408,7 +411,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -406,7 +410,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -526,7 +528,7 @@ index fe5725519..4c55f5f8c 100644
}
HandlerList.bakeAll();
@@ -427,36 +431,48 @@ public final class SimplePluginManager implements PluginManager {
@@ -425,36 +430,48 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -580,7 +582,7 @@ index fe5725519..4c55f5f8c 100644
public void clearPlugins() {
synchronized (this) {
disablePlugins();
@@ -518,7 +534,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -519,7 +536,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {

44
Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
View File

@ -1,4 +1,4 @@
From 1b07518a82ecb065e8b048fbf5dee4498d15c1be Mon Sep 17 00:00:00 2001
From f53ab7eff0bd8214cc0185fb8bb9f19f895aa6c9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 20:26:39 -0600
Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@ -6,49 +6,25 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async
This event can sometimes fire Async, set the proper boolean
diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java
index eb00d6af..70416c81 100644
index 46b11901..05167fb3 100644
--- a/src/main/java/org/bukkit/event/server/ServerEvent.java
+++ b/src/main/java/org/bukkit/event/server/ServerEvent.java
@@ -1,9 +1,19 @@
@@ -1,5 +1,6 @@
package org.bukkit.event.server;
+import org.bukkit.Bukkit;
import org.bukkit.event.Event;
/**
* Miscellaneous server events
*/
@@ -8,7 +9,7 @@ import org.bukkit.event.Event;
public abstract class ServerEvent extends Event {
+ // Paper start
+ public ServerEvent(boolean isAsync) {
+ super(isAsync);
+ }
+
+ public ServerEvent() {
+ super(!Bukkit.isPrimaryThread());
+ }
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
index d873763d..b68d7b2f 100644
--- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
+++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
@@ -23,6 +23,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
private int maxPlayers;
public ServerListPingEvent(@NotNull final InetAddress address, @NotNull final String motd, final int numPlayers, final int maxPlayers) {
+ super(); // Paper - Is this event being fired async?
Validate.isTrue(numPlayers >= 0, "Cannot have negative number of players online", numPlayers);
this.address = address;
this.motd = motd;
@@ -40,6 +41,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
* @param maxPlayers the max number of players
*/
protected ServerListPingEvent(@NotNull final InetAddress address, @NotNull final String motd, final int maxPlayers) {
+ super(); // Paper - Is this event being fired async?
this.numPlayers = MAGIC_PLAYER_COUNT;
this.address = address;
this.motd = motd;
public ServerEvent() {
- super();
+ super(!Bukkit.isPrimaryThread()); // Paper
}
public ServerEvent(boolean isAsync) {
--
2.21.0

4
Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
View File

@ -1,11 +1,11 @@
From 38ce360e0c5d461a283fd77ec5ebea7849e42728 Mon Sep 17 00:00:00 2001
From 3060ab89a8aad75f91754407cbe69c61f37d984d Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 13:05:59 -0800
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index 74816c63f..be11d52a0 100644
index 74816c63..be11d52a 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -62,4 +62,30 @@ public interface CommandSender extends Permissible {

6
Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -1,14 +1,14 @@
From 23b2c19d3d32bb5b75160c6aaab8cde7331b8068 Mon Sep 17 00:00:00 2001
From 60daf9d1f89657b5556791c550ec6df03b501370 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 af8ea5ca..1100e305 100644
index 5427c99a..ab666fb9 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -468,4 +468,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -467,4 +467,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @return collision status
*/
boolean isCollidable();

6
Spigot-API-Patches/0021-Complete-resource-pack-API.patch
View File

@ -1,11 +1,11 @@
From 3006cdc9d1fe4ed39e0cbf17b4a2726245c0efa6 Mon Sep 17 00:00:00 2001
From 88916b54a083813d0732f1c63461a5eca90a93e5 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 1de43bd33..c237073a3 100644
index 1de43bd3..c237073a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1212,7 +1212,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -82,7 +82,7 @@ index 1de43bd33..c237073a3 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 b98195650..4c2102a11 100644
index b9819565..4c2102a1 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;

24
Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
View File

@ -1,4 +1,4 @@
From 70e2fb3da9e5ab207150021fb5f3787c2dd216e8 Mon Sep 17 00:00:00 2001
From 2a1f662e39f99ea8f90a5391754df6d155ae0ffb 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 524231ecc..082f2f0c5 100644
index 81861781..2f68fba2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,17 @@
@@ -130,6 +130,17 @@
<version>7.1</version>
<scope>test</scope>
</dependency>
@ -29,7 +29,7 @@ index 524231ecc..082f2f0c5 100644
<build>
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
new file mode 100644
index 000000000..5b28e9b1d
index 00000000..5b28e9b1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
@@ -0,0 +1,42 @@
@ -77,7 +77,7 @@ index 000000000..5b28e9b1d
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
new file mode 100644
index 000000000..c83672427
index 00000000..c8367242
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
@@ -0,0 +1,43 @@
@ -126,7 +126,7 @@ index 000000000..c83672427
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
new file mode 100644
index 000000000..b6e7d8ee8
index 00000000..b6e7d8ee
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
@@ -0,0 +1,47 @@
@ -179,7 +179,7 @@ index 000000000..b6e7d8ee8
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
new file mode 100644
index 000000000..beed9e6e0
index 00000000..beed9e6e
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
@@ -0,0 +1,35 @@
@ -220,7 +220,7 @@ index 000000000..beed9e6e0
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
new file mode 100644
index 000000000..ac99477e9
index 00000000..ac99477e
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
@@ -0,0 +1,66 @@
@ -292,7 +292,7 @@ index 000000000..ac99477e9
+}
diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
new file mode 100644
index 000000000..72e48e8ef
index 00000000..72e48e8e
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
@@ -0,0 +1,35 @@
@ -332,7 +332,7 @@ index 000000000..72e48e8ef
+ }
+}
diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
index a850f0780..9026e108c 100644
index a850f078..9026e108 100644
--- a/src/main/java/org/bukkit/plugin/EventExecutor.java
+++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
@@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@ -412,10 +412,10 @@ index a850f0780..9026e108c 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index ac0702dfb..b9bf2124b 100644
index 85139364..024d8393 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -298,20 +298,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -297,20 +297,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}

2
Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
View File

@ -1,4 +1,4 @@
From cce6ae851ef26907674e191596d14c4769c953f2 Mon Sep 17 00:00:00 2001
From eca2d156a9ab87ab92228e8ae93fa65cc65cab02 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 19 May 2013 20:36:58 -0400
Subject: [PATCH] Add a call helper to Event

13
Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
View File

@ -1,4 +1,4 @@
From 897b248eb3ad7bb683e285b8c144942bc9e8e951 Mon Sep 17 00:00:00 2001
From 9de592f68b7fb6a7f83c8873216da8a771784ebd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 22 Jul 2015 18:50:41 -0400
Subject: [PATCH] Add sender name to commands.yml replacement
@ -7,19 +7,20 @@ This allows you to use $sender in commands.yml definitions to make
commands that auto target self.
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 982f0fb4..3276879d 100644
index a6ad94ef..9d4f553c 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -1,6 +1,8 @@
@@ -1,6 +1,9 @@
package org.bukkit.command;
import java.util.ArrayList;
+import java.util.regex.Matcher; // Paper
+import java.util.regex.Pattern; // Paper
+
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
@@ -20,7 +22,7 @@ public class FormattedCommandAlias extends Command {
@@ -19,7 +22,7 @@ public class FormattedCommandAlias extends Command {
ArrayList<String> commands = new ArrayList<String>();
for (String formatString : formatStrings) {
try {
@ -28,7 +29,7 @@ index 982f0fb4..3276879d 100644
} catch (Throwable throwable) {
if (throwable instanceof IllegalArgumentException) {
sender.sendMessage(throwable.getMessage());
@@ -38,7 +40,10 @@ public class FormattedCommandAlias extends Command {
@@ -37,7 +40,10 @@ public class FormattedCommandAlias extends Command {
return result;
}

20
Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
View File

@ -1,4 +1,4 @@
From d75c0ea906215bfa452df39659f7055ae44b2139 Mon Sep 17 00:00:00 2001
From 85e051d778411259e9b95ab5d4b292a4eeecdd46 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9b0cc417..03ba0b38 100644
index 184c024d..9fe31fab 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1546,6 +1546,13 @@ public final class Bukkit {
@@ -1529,6 +1529,13 @@ public final class Bukkit {
public static org.bukkit.command.CommandMap getCommandMap() {
return server.getCommandMap();
}
@ -24,10 +24,10 @@ index 9b0cc417..03ba0b38 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ab2ff962..2a47c12d 100644
index 246e081b..f6d9720c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1364,4 +1364,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1349,4 +1349,6 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Spigot spigot();
// Spigot end
@ -35,10 +35,10 @@ index ab2ff962..2a47c12d 100644
+ void reloadPermissions(); // Paper
}
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index 1104c603..ba118dbf 100644
index 50cc311b..c62da413 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -14,15 +14,35 @@ public class ReloadCommand extends BukkitCommand {
@@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
public ReloadCommand(@NotNull String name) {
super(name);
this.description = "Reloads the server configuration and plugins";
@ -76,7 +76,7 @@ index 1104c603..ba118dbf 100644
Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues when using some plugins.");
Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
Bukkit.reload();
@@ -34,6 +54,6 @@ public class ReloadCommand extends BukkitCommand {
@@ -33,6 +53,6 @@ public class ReloadCommand extends BukkitCommand {
@NotNull
@Override
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
@ -85,10 +85,10 @@ index 1104c603..ba118dbf 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 4c55f5f8..12e17709 100644
index ef38b2af..e4a0f938 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -777,4 +777,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -779,4 +779,13 @@ public final class SimplePluginManager implements PluginManager {
public void useTimings(boolean use) {
co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
}

2
Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
View File

@ -1,4 +1,4 @@
From 3221e9c9ac4d74ffe7e815253fc93a2bd323a958 Mon Sep 17 00:00:00 2001
From aad20b148458f6ddeb3712f30e7d8e86dfe6cbb4 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

4
Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
View File

@ -1,11 +1,11 @@
From 14d0514052df4c676af720494e3e328846fa3483 Mon Sep 17 00:00:00 2001
From 08e8906ba42e6a4c86d0ca56c9cb37f178885ab2 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:44:49 -0400
Subject: [PATCH] Access items by EquipmentSlot
diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
index ef55b1463..eb71f01e4 100644
index ef55b146..eb71f01e 100644
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -214,4 +214,23 @@ public interface PlayerInventory extends Inventory {

6
Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
View File

@ -1,4 +1,4 @@
From a07f747027ae1079c6e620e5881667686c265c13 Mon Sep 17 00:00:00 2001
From 908b4cc578018177445d0aa8e698025eaca3766c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:26:34 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
new file mode 100644
index 000000000..07660202e
index 00000000..07660202
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
@@ -0,0 +1,32 @@
@ -44,7 +44,7 @@ index 000000000..07660202e
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
new file mode 100644
index 000000000..e5dbbd660
index 00000000..e5dbbd66
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
@@ -0,0 +1,29 @@

4
Spigot-API-Patches/0029-EntityPathfindEvent.patch
View File

@ -1,4 +1,4 @@
From fa357068acea340946c5984451c2889eb725c7ac Mon Sep 17 00:00:00 2001
From 2d183ad2a2a9641486bce88f007e4fc63a8966a2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:15:34 -0400
Subject: [PATCH] EntityPathfindEvent
@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
new file mode 100644
index 000000000..63e46b2fb
index 00000000..63e46b2f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
@@ -0,0 +1,82 @@

21
Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
View File

@ -1,4 +1,4 @@
From 3fe3136ff948b8361bfadeb5e0acd6836bf8831c Mon Sep 17 00:00:00 2001
From e19f0490d85cb7478d10caf867592ab896f275ee Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com>
Date: Sat, 1 Jun 2013 13:52:30 -0600
Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@ -8,22 +8,19 @@ limited synchronized portions to allow much higher concurrency in
MetadataStore as well as far less locking, especially on reads
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
index 9dbc32d8..32728628 100644
index 02795349..b3d85d97 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -5,9 +5,10 @@ import org.bukkit.plugin.Plugin;
@@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
public abstract class MetadataStoreBase<T> {
- private Map<String, Map<Plugin, MetadataValue>> metadataMap = new HashMap<String, Map<Plugin, MetadataValue>>();
+ private Map<String, Map<Plugin, MetadataValue>> metadataMap = new ConcurrentHashMap<String, Map<Plugin, MetadataValue>>(); // Paper
+ private Map<String, Map<Plugin, MetadataValue>> metadataMap = new java.util.concurrent.ConcurrentHashMap<String, Map<Plugin, MetadataValue>>(); // Paper
/**
* Adds a metadata value to an object. Each metadata value is owned by a
@@ -41,7 +42,9 @@ public abstract class MetadataStoreBase<T> {
@@ -46,7 +46,9 @@ public abstract class MetadataStoreBase<T> {
entry = new WeakHashMap<Plugin, MetadataValue>(1);
metadataMap.put(key, entry);
}
@ -34,7 +31,7 @@ index 9dbc32d8..32728628 100644
}
/**
@@ -55,10 +58,11 @@ public abstract class MetadataStoreBase<T> {
@@ -60,10 +62,11 @@ public abstract class MetadataStoreBase<T> {
* @see MetadataStore#getMetadata(Object, String)
*/
@NotNull
@ -49,7 +46,7 @@ index 9dbc32d8..32728628 100644
return Collections.unmodifiableList(new ArrayList<MetadataValue>(values));
} else {
return Collections.emptyList();
@@ -73,7 +77,7 @@ public abstract class MetadataStoreBase<T> {
@@ -78,7 +81,7 @@ public abstract class MetadataStoreBase<T> {
* @param metadataKey the unique metadata key being queried.
* @return the existence of the metadataKey within subject.
*/
@ -58,7 +55,7 @@ index 9dbc32d8..32728628 100644
String key = disambiguate(subject, metadataKey);
return metadataMap.containsKey(key);
}
@@ -89,17 +93,18 @@ public abstract class MetadataStoreBase<T> {
@@ -94,17 +97,18 @@ public abstract class MetadataStoreBase<T> {
* org.bukkit.plugin.Plugin)
* @throws IllegalArgumentException If plugin is null
*/
@ -82,7 +79,7 @@ index 9dbc32d8..32728628 100644
}
}
@@ -112,7 +117,7 @@ public abstract class MetadataStoreBase<T> {
@@ -117,7 +121,7 @@ public abstract class MetadataStoreBase<T> {
* @see MetadataStore#invalidateAll(org.bukkit.plugin.Plugin)
* @throws IllegalArgumentException If plugin is null
*/

14
Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
View File

@ -1,4 +1,4 @@
From 0ae676c5ab5d5819d3e94e9ec554162a34fffa28 Mon Sep 17 00:00:00 2001
From 28da1a3671afc7a8d288c6fb2a4bba46fb825c3a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 16 Jul 2013 21:26:50 -0400
Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@ -6,10 +6,18 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
So that on reload, metadata will be cleared
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
index 32728628e..b634b124e 100644
index b3d85d97..0e8cd85c 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -126,6 +126,26 @@ public abstract class MetadataStoreBase<T> {
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator; // Paper
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
@@ -130,6 +131,26 @@ public abstract class MetadataStoreBase<T> {
}
}

4
Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
View File

@ -1,4 +1,4 @@
From adf141eaef52e9506de1c92a9145d884468f277f Mon Sep 17 00:00:00 2001
From 9ba80874e113b6a58abc867723476a56c1821484 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:08:36 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
new file mode 100644
index 000000000..09cfdf48e
index 00000000..09cfdf48
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
@@ -0,0 +1,46 @@

4
Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
View File

@ -1,4 +1,4 @@
From 55a53dc9696b2fa72c0d886729547b776cd0a76a Mon Sep 17 00:00:00 2001
From a9b5a8389171801c37d2e93174582e96087d161f 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
@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
new file mode 100644
index 000000000..46d6f6ad6
index 00000000..46d6f6ad
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
@@ -0,0 +1,221 @@

2
Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
View File

@ -1,4 +1,4 @@
From 2286649eb07e4a21436f8d660059dd6fa2f47641 Mon Sep 17 00:00:00 2001
From 96d6e1387e8ca6a7a772f8e1540481d71ace9089 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

2
Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
View File

@ -1,4 +1,4 @@
From e7360254c9b8b35b93943d7608685f5c7ffd20e1 Mon Sep 17 00:00:00 2001
From 4fe67c4add046aa9e0f5a4b7f41b96f5061c5d61 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

63
Spigot-API-Patches/0036-LootTable-API.patch
View File

@ -1,4 +1,4 @@
From fe6d16006ce532f553e149aa9943ba4776afad0b Mon Sep 17 00:00:00 2001
From 823936f1edcfbf8cb8d8cf2d6ba18eb14f86b9ac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 15:19:49 -0400
Subject: [PATCH] LootTable API
@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
new file mode 100644
index 000000000..92d7b853a
index 00000000..92d7b853
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
@@ -0,0 +1,17 @@
@ -35,7 +35,7 @@ index 000000000..92d7b853a
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
new file mode 100644
index 000000000..b387894fe
index 00000000..b387894f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
@@ -0,0 +1,17 @@
@ -58,7 +58,7 @@ index 000000000..b387894fe
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
new file mode 100644
index 000000000..97815eeb2
index 00000000..97815eeb
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
@@ -0,0 +1,116 @@
@ -180,7 +180,7 @@ index 000000000..97815eeb2
+}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
new file mode 100644
index 000000000..fd184f13f
index 00000000..fd184f13
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
@@ -0,0 +1,45 @@
@ -230,27 +230,28 @@ index 000000000..fd184f13f
+ }
+}
diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
index c553891e0..eb475ec84 100644
index c67d7110..a569c7b6 100644
--- a/src/main/java/org/bukkit/block/Chest.java
+++ b/src/main/java/org/bukkit/block/Chest.java
@@ -1,5 +1,6 @@
@@ -1,5 +1,7 @@
package org.bukkit.block;
+import com.destroystokyo.paper.loottable.LootableBlockInventory;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableBlockInventory; // Paper
+import org.bukkit.Nameable; // Paper
import org.bukkit.inventory.Inventory;
import org.bukkit.loot.Lootable;
@@ -8,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.NotNull;
@@ -7,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a captured state of a chest.
*/
-public interface Chest extends Container, Nameable, Lootable {
+public interface Chest extends Container, Nameable, LootableBlockInventory { // Paper
-public interface Chest extends Container, Lootable {
+public interface Chest extends Container, LootableBlockInventory { // Paper
/**
* Gets the inventory of the chest block represented by this block state.
diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
index 74cd194c9..07af1a3f0 100644
index 74cd194c..07af1a3f 100644
--- a/src/main/java/org/bukkit/block/Dispenser.java
+++ b/src/main/java/org/bukkit/block/Dispenser.java
@@ -1,5 +1,6 @@
@ -270,42 +271,40 @@ index 74cd194c9..07af1a3f0 100644
/**
* Gets the BlockProjectileSource object for the dispenser.
diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
index 2e8c3f711..47737b590 100644
index 424392fb..c7620232 100644
--- a/src/main/java/org/bukkit/block/Dropper.java
+++ b/src/main/java/org/bukkit/block/Dropper.java
@@ -1,12 +1,13 @@
@@ -1,11 +1,12 @@
package org.bukkit.block;
+import com.destroystokyo.paper.loottable.LootableBlockInventory;
import org.bukkit.Nameable;
import org.bukkit.loot.Lootable;
/**
* Represents a captured state of a dropper.
*/
-public interface Dropper extends Container, Nameable, Lootable {
+public interface Dropper extends Container, Nameable, LootableBlockInventory { // Paper
-public interface Dropper extends Container, Lootable {
+public interface Dropper extends Container, LootableBlockInventory { // Paper
/**
* Tries to drop a randomly selected item from the dropper's inventory,
diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
index 73fce5f33..221123e8c 100644
index 58e49309..7ade312f 100644
--- a/src/main/java/org/bukkit/block/Hopper.java
+++ b/src/main/java/org/bukkit/block/Hopper.java
@@ -1,9 +1,10 @@
@@ -1,8 +1,9 @@
package org.bukkit.block;
+import com.destroystokyo.paper.loottable.LootableBlockInventory;
import org.bukkit.Nameable;
import org.bukkit.loot.Lootable;
/**
* Represents a captured state of a hopper.
*/
-public interface Hopper extends Container, Nameable, Lootable { }
+public interface Hopper extends Container, Nameable, LootableBlockInventory { } // Paper
-public interface Hopper extends Container, Lootable { }
+public interface Hopper extends Container, LootableBlockInventory { } // Paper
diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
index 5a6bed64a..8c8811d4d 100644
index 938f9aea..42f5b4ea 100644
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
@@ -1,5 +1,6 @@
@ -313,19 +312,19 @@ index 5a6bed64a..8c8811d4d 100644
+import com.destroystokyo.paper.loottable.LootableBlockInventory;
import org.bukkit.DyeColor;
import org.bukkit.Nameable;
import org.bukkit.loot.Lootable;
@@ -8,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.NotNull;
@@ -7,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a captured state of a ShulkerBox.
*/
-public interface ShulkerBox extends Container, Nameable, Lootable {
+public interface ShulkerBox extends Container, Nameable, LootableBlockInventory { // Paper
-public interface ShulkerBox extends Container, Lootable {
+public interface ShulkerBox extends Container, LootableBlockInventory { // Paper
/**
* Get the {@link DyeColor} corresponding to this ShulkerBox
diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
index 8ced54039..865885501 100644
index 937b99f8..db69687a 100644
--- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
+++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
@@ -1,5 +1,6 @@
@ -343,9 +342,9 @@ index 8ced54039..865885501 100644
+public interface HopperMinecart extends Minecart, InventoryHolder, LootableEntityInventory {
/**
* Checks whether or not this Minecart will pick up
* Checks whether or not this Minecart will pick up
diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
index 9ea403e6f..238d118f7 100644
index 9ea403e6..238d118f 100644
--- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
+++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
@@ -1,5 +1,6 @@
@ -363,7 +362,7 @@ index 9ea403e6f..238d118f7 100644
+public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
}
diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
index 24a3d989d..901db8524 100644
index 24a3d989..901db852 100644
--- a/src/main/java/org/bukkit/loot/Lootable.java
+++ b/src/main/java/org/bukkit/loot/Lootable.java
@@ -36,6 +36,34 @@ public interface Lootable {

6
Spigot-API-Patches/0037-Add-EntityZapEvent.patch
View File

@ -1,4 +1,4 @@
From d83973b95e1f261cb7d70b06771709d73a73624f Mon Sep 17 00:00:00 2001
From 81d25abccb60bfa3607c1a70719d61b1d57f5a52 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:34 -0700
Subject: [PATCH] Add EntityZapEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
new file mode 100644
index 000000000..3b725a489
index 00000000..3b725a48
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
@@ -0,0 +1,65 @@
@ -76,7 +76,7 @@ index 000000000..3b725a489
+ }
+}
diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
index 0074423fd..0eaa8df94 100644
index 0074423f..0eaa8df9 100644
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -2,6 +2,7 @@ package org.bukkit.event.entity;

4
Spigot-API-Patches/0038-Misc-Utils.patch
View File

@ -1,4 +1,4 @@
From a3d13870daf8d1b11309cbbf8947ae5324aed6b5 Mon Sep 17 00:00:00 2001
From d47598b680c174abd7021e7857452886e09f4346 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 12:53:43 -0500
Subject: [PATCH] Misc Utils
@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils
diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
new file mode 100644
index 000000000..5bb677ce5
index 00000000..5bb677ce
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
@@ -0,0 +1,34 @@

20
Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
View File

@ -1,4 +1,4 @@
From c1756d0416f0a65ab568975369fccfbbf04118d1 Mon Sep 17 00:00:00 2001
From 115bd301484371f6d9f6dfdec617abbe9df39f74 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,10 +6,10 @@ 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 03ba0b38..08570c13 100644
index 9fe31fab..c7f4c6f2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1553,6 +1553,15 @@ public final class Bukkit {
@@ -1536,6 +1536,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index 03ba0b38..08570c13 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2a47c12d..fc8887d1 100644
index f6d9720c..f248400e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1366,4 +1366,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1351,4 +1351,6 @@ public interface Server extends PluginMessageRecipient {
// Spigot end
void reloadPermissions(); // Paper
@ -56,10 +56,10 @@ index bd2c7a69..864c263b 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 682d27f9..b78f3d69 100644
index 911d90fd..8d352eeb 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -285,4 +285,11 @@ public class SimpleCommandMap implements CommandMap {
@@ -289,4 +289,11 @@ public class SimpleCommandMap implements CommandMap {
}
}
}
@ -72,10 +72,10 @@ index 682d27f9..b78f3d69 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index ba118dbf..607323a8 100644
index c62da413..af8ab73f 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -14,7 +14,7 @@ public class ReloadCommand extends BukkitCommand {
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
public ReloadCommand(@NotNull String name) {
super(name);
this.description = "Reloads the server configuration and plugins";
@ -84,7 +84,7 @@ index ba118dbf..607323a8 100644
this.setPermission("bukkit.command.reload");
this.setAliases(Arrays.asList("rl"));
}
@@ -30,6 +30,13 @@ public class ReloadCommand extends BukkitCommand {
@@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
Bukkit.getServer().reloadPermissions();
Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
return true;

4
Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
View File

@ -1,11 +1,11 @@
From 50250b4955c5c76238ed4e75479dfa1aa751ba02 Mon Sep 17 00:00:00 2001
From dfd138e944f9160fc420ca7166f17938eeb60b78 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:47:08 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
index c99c9281e..7c340f539 100644
index c99c9281..7c340f53 100644
--- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
@@ -1,21 +1,43 @@

4
Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
View File

@ -1,4 +1,4 @@
From b82e438ee56e44088151a3448d9c6ea578145238 Mon Sep 17 00:00:00 2001
From 619be3c6e1af342ed5b97e56b426e9767bc3c630 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
new file mode 100644
index 000000000..453663893
index 00000000..45366389
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
@@ -0,0 +1,67 @@

4
Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
View File

@ -1,11 +1,11 @@
From 5867309b06bfe09471d79910963d912d588e860d Mon Sep 17 00:00:00 2001
From e8135e116f16410a8b79c0520b4033553c3a237c 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 c237073a3..219556ed5 100644
index c237073a..219556ed 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -423,6 +423,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

2
Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
View File

@ -1,4 +1,4 @@
From 6edfd35a599174ec0bc6a869b274e5f7e74b54fb Mon Sep 17 00:00:00 2001
From daf8f6bd192c9dcbf227bc01c9a323fd59e254b8 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move

4
Spigot-API-Patches/0044-IllegalPacketEvent.patch
View File

@ -1,4 +1,4 @@
From 1f9c546f72d454fff0de581f0c64cdd552520787 Mon Sep 17 00:00:00 2001
From 6326993e6b80b9f7aceb5601e7f0bd79b8824db2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 4 Dec 2016 01:19:14 -0500
Subject: [PATCH] IllegalPacketEvent
@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not.
diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
new file mode 100644
index 000000000..37a17f0bb
index 00000000..37a17f0b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
@@ -0,0 +1,70 @@

4
Spigot-API-Patches/0045-Fireworks-API-s.patch
View File

@ -1,4 +1,4 @@
From 598ca05d30454f06b4b08c9080ad038b0ffcb8d5 Mon Sep 17 00:00:00 2001
From fee18582db9f6a66e6476a7e2ff900e082ac1659 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 28 Dec 2016 01:18:55 -0500
Subject: [PATCH] Fireworks API's
@ -7,7 +7,7 @@ Get the Entity being boosted
Get the firework launcher
diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
index 1c55f0338..7df26cf7f 100644
index 1c55f033..7df26cf7 100644
--- a/src/main/java/org/bukkit/entity/Firework.java
+++ b/src/main/java/org/bukkit/entity/Firework.java
@@ -3,6 +3,9 @@ package org.bukkit.entity;

4
Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
View File

@ -1,4 +1,4 @@
From 21f79b080ee93ae3e8f46411349e84b6bb1f87f3 Mon Sep 17 00:00:00 2001
From 4b0ac62856b74a0a002b280d0d8a60d7a038e180 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,7 +7,7 @@ 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 000000000..b64ab6eec
index 00000000..b64ab6ee
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
@@ -0,0 +1,29 @@

6
Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
View File

@ -1,4 +1,4 @@
From 689c6a8f4240960a10dbfce71ad4b2c1dd456251 Mon Sep 17 00:00:00 2001
From 28f5e7081c337610bbb54fffccefa9665a1b814d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:23:03 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ffae53d6..846b0619 100644
index 05a82e4f..0e6dd6e1 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -31,6 +31,33 @@ import org.jetbrains.annotations.Nullable;
@@ -37,6 +37,33 @@ import org.jetbrains.annotations.Nullable;
*/
public interface World extends PluginMessageRecipient, Metadatable {

4
Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -1,4 +1,4 @@
From 92864aea93c48d6757f3ec929d235f61563bf0b6 Mon Sep 17 00:00:00 2001
From 59ae19524b32260191e1daaa772623d3c08255d1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:28:32 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
Replaces isFromBottle() with logic that persists entity reloads too.
diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
index c286edfd8..57029d9bc 100644
index c286edfd..57029d9b 100644
--- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
+++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
@@ -1,5 +1,8 @@

2
Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
View File

@ -1,4 +1,4 @@
From 4e9c8caa8395d98ee682ff83f656c5128a5801d0 Mon Sep 17 00:00:00 2001
From 09790abb8f5f87f7af4f33d8e9f0f3a2af51674c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 21 Jan 2017 17:03:10 -0600
Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check

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

@ -1,4 +1,4 @@
From c257016dfd957d957c31920232cd6ba10a5db45e Mon Sep 17 00:00:00 2001
From edba48d35f93076c75eb85e2d5f502ec17832986 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 08570c13..92bc8eb6 100644
index c7f4c6f2..411e534b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1562,6 +1562,16 @@ public final class Bukkit {
@@ -1545,6 +1545,16 @@ public final class Bukkit {
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
@ -27,10 +27,10 @@ index 08570c13..92bc8eb6 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fc8887d1..9fa704e3 100644
index f248400e..2778ce92 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1368,4 +1368,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1353,4 +1353,14 @@ public interface Server extends PluginMessageRecipient {
void reloadPermissions(); // Paper
boolean reloadCommandAliases(); // Paper
@ -46,10 +46,10 @@ index fc8887d1..9fa704e3 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
index 92c23424..e420b790 100644
index 30597d30..6206ff44 100644
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
@@ -150,6 +150,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
}
if (completions == null) {

62
Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
View File

@ -1,4 +1,4 @@
From cc46bf75294e7b9ce639b3d6bde64193799859d9 Mon Sep 17 00:00:00 2001
From 811f1e098bd6192a850ab6b9ce5b121664628c21 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
@ -6,7 +6,7 @@ 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 ffebffd8b..f5e3929aa 100644
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 {
@ -21,10 +21,10 @@ index ffebffd8b..f5e3929aa 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 846b0619a..84abeb216 100644
index 0e6dd6e1..ac12a8fb 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1666,6 +1666,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1643,6 +1643,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 +32,7 @@ index 846b0619a..84abeb216 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
@@ -1681,6 +1682,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1658,6 +1659,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 +40,7 @@ index 846b0619a..84abeb216 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
@@ -1730,6 +1732,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1707,6 +1709,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 +48,7 @@ index 846b0619a..84abeb216 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -1749,6 +1752,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1726,6 +1729,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 +56,7 @@ index 846b0619a..84abeb216 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);
@@ -1804,6 +1808,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1781,6 +1785,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 +64,7 @@ index 846b0619a..84abeb216 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -1825,6 +1830,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1802,6 +1807,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 +72,7 @@ index 846b0619a..84abeb216 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);
@@ -1847,6 +1853,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1824,6 +1830,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 +80,7 @@ index 846b0619a..84abeb216 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);
@@ -1871,6 +1878,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1848,6 +1855,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
@ -89,7 +89,7 @@ index 846b0619a..84abeb216 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 2f1956724..234aa9dd2 100644
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
@ -102,7 +102,7 @@ index 2f1956724..234aa9dd2 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
index d258e734e..123d87954 100644
index 290aff28..9fd54b96 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 {
@ -114,7 +114,7 @@ index d258e734e..123d87954 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 98af0563c..ec6890ae6 100644
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 {
@ -127,7 +127,7 @@ index 98af0563c..ec6890ae6 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
index 734f5ac7b..5efa4e606 100644
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 {
@ -140,7 +140,7 @@ index 734f5ac7b..5efa4e606 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 219556ed5..c21785d58 100644
index 219556ed..c21785d5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -438,7 +438,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -233,7 +233,7 @@ index 219556ed5..c21785d58 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 2a0b01097..2ac30c0f6 100644
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 {
@ -245,7 +245,7 @@ index 2a0b01097..2ac30c0f6 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
index 756f285eb..ee2e70c67 100644
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 {
@ -267,10 +267,10 @@ index 756f285eb..ee2e70c67 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index 8d4c70031..b493173e2 100644
index 1ca8de5e..0dba5d01 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -29,6 +29,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -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
@ -278,7 +278,7 @@ index 8d4c70031..b493173e2 100644
*/
public PlayerLoginEvent(@NotNull final Player player, @NotNull final String hostname, @NotNull final InetAddress address, final @NotNull InetAddress realAddress) { // Spigot
super(player);
@@ -52,6 +53,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -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
@ -287,7 +287,7 @@ index 8d4c70031..b493173e2 100644
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 8b9018451..374fe3644 100644
index 8b901845..374fe364 100644
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -76,7 +76,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
@ -300,7 +300,7 @@ index 8b9018451..374fe3644 100644
return to;
}
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 07d2b4cfe..cbcbe8c8a 100644
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 {
@ -318,10 +318,10 @@ index 07d2b4cfe..cbcbe8c8a 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
index 668e91958..5ff1f93d1 100644
index ab2b5958..4b0aef05 100644
--- a/src/main/java/org/bukkit/inventory/Merchant.java
+++ b/src/main/java/org/bukkit/inventory/Merchant.java
@@ -35,7 +35,7 @@ public interface Merchant {
@@ -34,7 +34,7 @@ public interface Merchant {
*
* @param i the index
* @return the recipe
@ -330,7 +330,7 @@ index 668e91958..5ff1f93d1 100644
*/
@NotNull
MerchantRecipe getRecipe(int i) throws IndexOutOfBoundsException;
@@ -45,7 +45,7 @@ public interface Merchant {
@@ -44,7 +44,7 @@ public interface Merchant {
*
* @param i the index
* @param recipe the recipe
@ -340,10 +340,10 @@ index 668e91958..5ff1f93d1 100644
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 63b7c70ce..a57f70ec6 100644
index 57d893a4..77846f32 100644
--- a/src/main/java/org/bukkit/potion/Potion.java
+++ b/src/main/java/org/bukkit/potion/Potion.java
@@ -79,6 +79,7 @@ public class Potion {
@@ -78,6 +78,7 @@ public class Potion {
}
/**
@ -352,10 +352,10 @@ index 63b7c70ce..a57f70ec6 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
index 9f913e1ee..254bd6f3e 100644
index 91ddadbb..d21f407c 100644
--- a/src/main/java/org/bukkit/potion/PotionBrewer.java
+++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
@@ -38,6 +38,8 @@ public interface PotionBrewer {
@@ -37,6 +37,8 @@ public interface PotionBrewer {
* a potion with the given type.
*
* @param type The type of the potion
@ -365,7 +365,7 @@ index 9f913e1ee..254bd6f3e 100644
*/
@NotNull
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
index 9b0fcf2da..e83e4b4fd 100644
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 {

2
Spigot-API-Patches/0052-Item-canEntityPickup.patch
View File

@ -1,4 +1,4 @@
From 437d485cd0d2633307712d9f0c05e5ad4d809bf9 Mon Sep 17 00:00:00 2001
From 87a96f0c2377911d526b21f1353398f3bf33198f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 03:57:08 -0500
Subject: [PATCH] Item#canEntityPickup

2
Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
View File

@ -1,4 +1,4 @@
From bfb751c0cc1a9b5d9e913c1334d2fd5b67045402 Mon Sep 17 00:00:00 2001
From d8be66ef36bc2d6b2a7581eeee0ccbe567ff0716 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 May 2017 06:26:01 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer

4
Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
View File

@ -1,4 +1,4 @@
From 75757b48a916e1c8b4d1dd2d543baae0526525e2 Mon Sep 17 00:00:00 2001
From db41e869a62491d7136eccdf5032653ac17c8c4d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 11 Jun 2017 16:30:37 -0500
Subject: [PATCH] PlayerAttemptPickupItemEvent
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
new file mode 100644
index 000000000..fb5cb3dc4
index 00000000..fb5cb3dc
--- /dev/null
+++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
@@ -0,0 +1,89 @@

4
Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
View File

@ -1,4 +1,4 @@
From 935c2498cb5d9d4920e90ab90ff786114a1d114f Mon Sep 17 00:00:00 2001
From ec4a76274dc2d8fa737b1cca310d75c4f4628bc7 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,7 +6,7 @@ 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 000000000..251342c3c
index 00000000..251342c3
--- /dev/null
+++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
@@ -0,0 +1,82 @@

10
Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From 7def00d86d228835b95d99b7526e25e62064723a Mon Sep 17 00:00:00 2001
From c3fa1c3006bf1c9e6f786581aac8fe876653678c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 21:46:46 -0500
Subject: [PATCH] Basic PlayerProfile API
@ -235,10 +235,10 @@ index 00000000..7b3b6ef5
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 92bc8eb6..7c97b11b 100644
index 411e534b..bb235ed6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1572,6 +1572,40 @@ public final class Bukkit {
@@ -1555,6 +1555,40 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -280,10 +280,10 @@ index 92bc8eb6..7c97b11b 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9fa704e3..bf75e6a2 100644
index 2778ce92..c1c1d384 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1377,5 +1377,33 @@ public interface Server extends PluginMessageRecipient {
@@ -1362,5 +1362,33 @@ public interface Server extends PluginMessageRecipient {
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();

4
Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
View File

@ -1,11 +1,11 @@
From 5fcee5665b665276220dc2a9eedb5588880b2f9d Mon Sep 17 00:00:00 2001
From 0c0dcf70779a634834277770a644ce513a240d5f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:04:51 -0400
Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index f76bc85c4..037e23930 100644
index f76bc85c..037e2393 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -331,6 +331,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

6
Spigot-API-Patches/0058-Profile-Lookup-Events.patch
View File

@ -1,4 +1,4 @@
From 0e47d3ccc037ae116f442c963aef0ff5115a4186 Mon Sep 17 00:00:00 2001
From 899ca9c0ccac00c3c564243608ed32aaa5a0fb4f 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
@ -8,7 +8,7 @@ profiles that had to be looked up.
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 000000000..8df37c07c
index 00000000..8df37c07
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
@@ -0,0 +1,46 @@
@ -60,7 +60,7 @@ index 000000000..8df37c07c
+}
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 000000000..4dcf6242c
index 00000000..4dcf6242
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
@@ -0,0 +1,108 @@

6
Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
View File

@ -1,14 +1,14 @@
From 8a669ab697d0c15360d7618826c81c89ca2cb3c8 Mon Sep 17 00:00:00 2001
From e9cc77d6cf44ce00f1dd2c47535573e04eaf56dc Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index b4df9b779..6dd0623bf 100644
index fa7ab5af..a1edcf02 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -604,5 +604,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -603,5 +603,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
*/
@Nullable
Location getOrigin();

10
Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
View File

@ -1,4 +1,4 @@
From 01ff2f70c2ef6bafe4b99eb940d63bb256526819 Mon Sep 17 00:00:00 2001
From 27d64c363e7fdb673502b22a0763161af9aa4df6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 10 Dec 2016 16:12:48 -0500
Subject: [PATCH] Improve the Saddle API for Horses
@ -8,7 +8,7 @@ and access their saddle state separately from an interface shared with Armor.
diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
new file mode 100644
index 000000000..163ffe8ff
index 00000000..163ffe8f
--- /dev/null
+++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
@@ -0,0 +1,21 @@
@ -34,7 +34,7 @@ index 000000000..163ffe8ff
+ void setArmor(@Nullable ItemStack stack);
+}
diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java
index 608e99c42..53498debe 100644
index 608e99c4..53498deb 100644
--- a/src/main/java/org/bukkit/inventory/HorseInventory.java
+++ b/src/main/java/org/bukkit/inventory/HorseInventory.java
@@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable;
@ -60,7 +60,7 @@ index 608e99c42..53498debe 100644
-}
+public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {}
diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java
index 2fa2c9d07..5ac1afb8a 100644
index 2fa2c9d0..5ac1afb8 100644
--- a/src/main/java/org/bukkit/inventory/LlamaInventory.java
+++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;
@ -74,7 +74,7 @@ index 2fa2c9d07..5ac1afb8a 100644
* Gets the item in the llama's decor slot.
diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
new file mode 100644
index 000000000..7944f26a3
index 00000000..7944f26a
--- /dev/null
+++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
@@ -0,0 +1,3 @@

6
Spigot-API-Patches/0061-ensureServerConversions-API.patch
View File

@ -1,4 +1,4 @@
From 20eb853456b944fc4eb760f9ee5c6bfa3433513b Mon Sep 17 00:00:00 2001
From ae030eb68664e246e3610cd6e0b9eb66c7b75bc3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] ensureServerConversions API
@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
to ensure it meets latest minecraft expectations.
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index cbcbe8c8a..8e602cf51 100644
index cbcbe8c8..8e602cf5 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -141,4 +141,17 @@ public interface ItemFactory {
@ -29,7 +29,7 @@ index cbcbe8c8a..8e602cf51 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 7b709457f..4ee01be5f 100644
index 7b709457..4ee01be5 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -517,7 +517,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

6
Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
View File

@ -1,4 +1,4 @@
From 35bbd72e452d3c31afe5217706a2a60df856117f Mon Sep 17 00:00:00 2001
From 1083cf344326c8c77207bab66a92c2d06d4f9f7d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] Add getI18NDisplayName API
@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
You must replace the language file embedded in the server jar.
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 8e602cf51..dca77bbaf 100644
index 8e602cf5..dca77bba 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -153,5 +153,16 @@ public interface ItemFactory {
@ -29,7 +29,7 @@ index 8e602cf51..dca77bbaf 100644
// Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 4ee01be5f..3ff3458e7 100644
index 4ee01be5..3ff3458e 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -590,5 +590,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

4
Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
View File

@ -1,4 +1,4 @@
From c76cd792c71b03975683e5660613d55613c025f8 Mon Sep 17 00:00:00 2001
From 0ee9a5961484c254e1c97c7ce215a9a48da3cb90 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:34 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent
@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
new file mode 100644
index 000000000..b10176289
index 00000000..b1017628
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
@@ -0,0 +1,117 @@

11
Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
View File

@ -1,23 +1,24 @@
From 482ec24d923b8dc78080d5edcfe1422087035346 Mon Sep 17 00:00:00 2001
From 7e6884097c480972ee63619950c2f45be6042865 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 02:08:55 -0500
Subject: [PATCH] Make /plugins list alphabetical
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index 6f95bf3c..d4e74d29 100644
index 11fbd0e0..d4e74d29 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -3,6 +3,8 @@ package org.bukkit.command.defaults;
@@ -3,6 +3,9 @@ package org.bukkit.command.defaults;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -35,19 +37,24 @@ public class PluginsCommand extends BukkitCommand {
import org.bukkit.command.CommandSender;
@@ -34,19 +37,24 @@ public class PluginsCommand extends BukkitCommand {
@NotNull
private String getPluginList() {

6
Spigot-API-Patches/0065-LivingEntity-setKiller.patch
View File

@ -1,14 +1,14 @@
From 8b825df13b6aaa53037a89ec4c1c05b4b6ea4173 Mon Sep 17 00:00:00 2001
From ab9a652b2d9f9d0d0e9015a631a77e61a42499b6 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 1100e305..706d8f52 100644
index ab666fb9..49c79028 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -249,6 +249,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@Nullable
public Player getKiller();

8
Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
View File

@ -1,4 +1,4 @@
From 6b3735bc5ec6609bb14a78335eaa7ea5c5574db4 Mon Sep 17 00:00:00 2001
From b733f821905e9d3385d6e20ff17a6a07e652741a Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:14:13 +0200
Subject: [PATCH] Handle plugin prefixes in implementation logging
@ -17,10 +17,10 @@ The implementation should handle plugin prefixes by displaying
logger names when appropriate.
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index 7c934899..9a342788 100644
index 22319005..bb2e55e9 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -44,7 +44,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
private boolean naggable = true;
private FileConfiguration newConfig = null;
private File configFile = null;
@ -29,7 +29,7 @@ index 7c934899..9a342788 100644
public JavaPlugin() {
final ClassLoader classLoader = this.getClass().getClassLoader();
@@ -278,7 +278,8 @@ public abstract class JavaPlugin extends PluginBase {
@@ -276,7 +276,8 @@ public abstract class JavaPlugin extends PluginBase {
this.dataFolder = dataFolder;
this.classLoader = classLoader;
this.configFile = new File(dataFolder, "config.yml");

10
Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,4 +1,4 @@
From 4d33389d2be22a2955605e09a43ffd1109a3eddb Mon Sep 17 00:00:00 2001
From f40e94e3adcc3372c06c1cec02bce37804413e93 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:33:12 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction.
diff --git a/pom.xml b/pom.xml
index 082f2f0c5..13cdc25f8 100644
index 2f68fba2..4f394580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,13 @@
@@ -111,6 +111,13 @@
<version>17.0.0</version>
<scope>provided</scope>
</dependency>
@ -32,10 +32,10 @@ index 082f2f0c5..13cdc25f8 100644
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index 076ec041f..b4882f48b 100644
index febfec6e..79890c68 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
@@ -167,6 +167,13 @@ public interface Plugin extends TabExecutor {
@@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {
@NotNull
public Logger getLogger();

18
Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
View File

@ -1,4 +1,4 @@
From ab3fa3cb5c5e5389c8fb4900b9e5fb6800e11be1 Mon Sep 17 00:00:00 2001
From 8cc0cf9092f9b58e9f7cf6f1cd8b5bda990b7d3d Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@ -14,7 +14,7 @@ parent of the plugin logger to avoid this.
diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
new file mode 100644
index 000000000..76f2cb9cd
index 00000000..76f2cb9c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
@@ -0,0 +1,41 @@
@ -60,10 +60,10 @@ index 000000000..76f2cb9cd
+
+}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index 9a3427882..96ebe72ca 100644
index bb2e55e9..04fa3991 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -44,7 +44,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
private boolean naggable = true;
private FileConfiguration newConfig = null;
private File configFile = null;
@ -72,7 +72,7 @@ index 9a3427882..96ebe72ca 100644
public JavaPlugin() {
final ClassLoader classLoader = this.getClass().getClassLoader();
@@ -278,8 +278,11 @@ public abstract class JavaPlugin extends PluginBase {
@@ -276,8 +276,11 @@ public abstract class JavaPlugin extends PluginBase {
this.dataFolder = dataFolder;
this.classLoader = classLoader;
this.configFile = new File(dataFolder, "config.yml");
@ -87,10 +87,10 @@ index 9a3427882..96ebe72ca 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index c39fcac5a..0df1926fa 100644
index b859796b..6f39f571 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -38,6 +38,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -37,6 +37,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
final JavaPlugin plugin;
private JavaPlugin pluginInit;
private IllegalStateException pluginState;
@ -98,7 +98,7 @@ index c39fcac5a..0df1926fa 100644
static {
ClassLoader.registerAsParallelCapable();
@@ -55,6 +56,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -54,6 +55,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
this.manifest = jar.getManifest();
this.url = file.toURI().toURL();
@ -107,7 +107,7 @@ index c39fcac5a..0df1926fa 100644
try {
Class<?> jarClass;
try {
@@ -172,6 +175,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -171,6 +174,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
pluginState = new IllegalStateException("Initial initialization");
this.pluginInit = javaPlugin;

4
Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
View File

@ -1,4 +1,4 @@
From c6b1a2b8f11a56eb2d4e78d492fc679cc20fbed1 Mon Sep 17 00:00:00 2001
From e1a030f03aec0d3f4659ff005dd004adda025de0 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 Sep 2017 17:21:32 -0400
Subject: [PATCH] Add PlayerJumpEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
new file mode 100644
index 000000000..289a0d784
index 00000000..289a0d78
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
@@ -0,0 +1,106 @@

6
Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
View File

@ -1,4 +1,4 @@
From 288a297fa9c66575aca683e0f2cb693bc119a3c2 Mon Sep 17 00:00:00 2001
From f0f9d92355cf99f298ffb63c693b6c9b410052ed Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 10 Oct 2017 18:44:42 +0200
Subject: [PATCH] Expose client protocol version and virtual host
@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
new file mode 100644
index 000000000..7b2af1bd7
index 00000000..7b2af1bd
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
@@ -0,0 +1,41 @@
@ -57,7 +57,7 @@ index 000000000..7b2af1bd7
+
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4b59f8feb..eeed2e796 100644
index c21785d5..247ed072 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;

4
Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
View File

@ -1,4 +1,4 @@
From 72e0411e853da36205ab8e3d24041de5d7b80ac5 Mon Sep 17 00:00:00 2001
From 986fa3f55231a220bf061a5c79084e00a73396d0 Mon Sep 17 00:00:00 2001
From: pkt77 <parkerkt77@gmail.com>
Date: Fri, 10 Nov 2017 23:45:59 -0500
Subject: [PATCH] Add PlayerArmorChangeEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
new file mode 100644
index 000000000..2827a1002
index 00000000..2827a100
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
@@ -0,0 +1,137 @@

6
Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
View File

@ -1,4 +1,4 @@
From f88c6e674e15899aa75a38b121eda2ee7e3f8cd2 Mon Sep 17 00:00:00 2001
From fac60bf80e0ed4e37e2f15a662fcabc2881e80ba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Nov 2017 21:10:01 -0500
Subject: [PATCH] API to get a BlockState without a snapshot
@ -9,10 +9,10 @@ on the real tile entity.
This is useful for where performance is needed
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index c88088c0f..708288e99 100644
index ab6750c7..af4ffada 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -269,6 +269,16 @@ public interface Block extends Metadatable {
@@ -268,6 +268,16 @@ public interface Block extends Metadatable {
@NotNull
BlockState getState();

6
Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
View File

@ -1,4 +1,4 @@
From aaede4321cd33af05db4d80ad1e75d17782fd65b Mon Sep 17 00:00:00 2001
From c9fa8f5324751e3b6443539634b888fffdf3044b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Nov 2017 13:17:09 -0500
Subject: [PATCH] AsyncTabCompleteEvent
@ -13,7 +13,7 @@ completion, such as offline players.
diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
new file mode 100644
index 000000000..619ed3716
index 00000000..619ed371
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
@@ -0,0 +1,177 @@
@ -195,7 +195,7 @@ index 000000000..619ed3716
+ }
+}
diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
index d1a9956a1..f96c4ba53 100644
index d1a9956a..f96c4ba5 100644
--- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
+++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
@@ -1,5 +1,6 @@

10
Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
View File

@ -1,4 +1,4 @@
From fdf1b7fd4ed6b12ec92df144e1961d3e5b198d61 Mon Sep 17 00:00:00 2001
From 686c76fc32425a5fd568cb11693f89c798055456 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 9 Dec 2017 12:40:25 -0500
Subject: [PATCH] Display warning on deprecated recipe API
@ -10,10 +10,10 @@ on the players login.
Plugin authors need to define a key to keep it consistent between server restarts.
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
index 77e6ccf5..64a43f42 100644
index 83c72eda..038ed0a6 100644
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -26,6 +26,7 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -24,6 +24,7 @@ public class ShapedRecipe implements Recipe, Keyed {
@Deprecated
public ShapedRecipe(@NotNull ItemStack result) {
this.key = NamespacedKey.randomKey();
@ -22,10 +22,10 @@ index 77e6ccf5..64a43f42 100644
}
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
index a8d5f330..46a398e8 100644
index ef28e75d..823645c5 100644
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -27,6 +27,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -25,6 +25,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@Deprecated
public ShapelessRecipe(@NotNull ItemStack result) {
this.key = NamespacedKey.randomKey();

4
Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
View File

@ -1,4 +1,4 @@
From 0bd98a68ee81d13dcf28e6f6ef85eb63920b46f4 Mon Sep 17 00:00:00 2001
From 25b565fcee0be8aba234ef72d4e6b5ad303ef72a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 22:00:41 -0500
Subject: [PATCH] PlayerPickupExperienceEvent
@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
new file mode 100644
index 000000000..f7beb22d5
index 00000000..f7beb22d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
@@ -0,0 +1,80 @@

4
Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
View File

@ -1,4 +1,4 @@
From 014342436b9d0a522d4948efe3f699fef8b8cc15 Mon Sep 17 00:00:00 2001
From 9abbd1fad3e1556130905142de3c6649688f2993 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 22:56:24 -0500
Subject: [PATCH] ExperienceOrbMergeEvent
@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
new file mode 100644
index 000000000..0ce3e3977
index 00000000..0ce3e397
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
@@ -0,0 +1,87 @@

4
Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
View File

@ -1,4 +1,4 @@
From e86f55218e61959a7851efd9453a5785e1eaef93 Mon Sep 17 00:00:00 2001
From 323d8fa0173c68391c1e828cdbf4ae6ee6cb555c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Dec 2017 17:38:07 -0500
Subject: [PATCH] Ability to apply mending to XP API
@ -10,7 +10,7 @@ of giving the player experience points.
Both an API To standalone mend, and apply mending logic to .giveExp has been added.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7be6778a..f19b8b99 100644
index 247ed072..c7bc13e7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -946,12 +946,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

4
Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From 35452d656b653b45dd767d53bae2d6c1e87a81d9 Mon Sep 17 00:00:00 2001
From 69201b817c39c9959a8e0154f99be75bf825a72d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 16:59:43 -0500
Subject: [PATCH] PreCreatureSpawnEvent
@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
new file mode 100644
index 000000000..d5edde9cd
index 00000000..d5edde9c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
@@ -0,0 +1,104 @@

4
Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
View File

@ -1,4 +1,4 @@
From 1f5cbf18a8beea7d63e03e6c2fb786985f581f03 Mon Sep 17 00:00:00 2001
From 65cbe82faadc65085e95f13e83fc7e6a018100d4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 17:31:37 -0500
Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
new file mode 100644
index 000000000..112a0dbf5
index 00000000..112a0dbf
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
@@ -0,0 +1,64 @@

2
Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
View File

@ -1,4 +1,4 @@
From 907a0b84b6a2bfa31356bf1d72f7a8210be4e612 Mon Sep 17 00:00:00 2001
From 35a4d7387a22fe69f696b54ea874cb44d6f77a06 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:29:28 -0500
Subject: [PATCH] Add setPlayerProfile API for Skulls

6
Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
View File

@ -1,4 +1,4 @@
From 53a81651f2f57c8d8b5a104b7d95a5c7287881f7 Mon Sep 17 00:00:00 2001
From 85b20f933f2c008a358b790e2a554b69e34d12bf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 2 Jan 2018 00:31:08 -0500
Subject: [PATCH] Fill Profile Property Events
@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
new file mode 100644
index 000000000..71f36e9ca
index 00000000..71f36e9c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
@@ -0,0 +1,75 @@
@ -93,7 +93,7 @@ index 000000000..71f36e9ca
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
new file mode 100644
index 000000000..021bc8631
index 00000000..021bc863
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
@@ -0,0 +1,77 @@

4
Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
View File

@ -1,4 +1,4 @@
From c53db31449879e3307930215473d83a9e14440f7 Mon Sep 17 00:00:00 2001
From cbfc65bf36d39478f9809431b9610ebec21bd699 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 19 Jan 2018 08:15:14 -0600
Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
new file mode 100644
index 000000000..bb8d7c959
index 00000000..bb8d7c95
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
@@ -0,0 +1,63 @@

4
Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
View File

@ -1,4 +1,4 @@
From a41ad2b2b17582d7d06e0ff76289ae75ddb9d0aa Mon Sep 17 00:00:00 2001
From 11d6f5499f0a3d3c885d5de311c57ab98403309e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Jan 2018 17:06:24 -0500
Subject: [PATCH] Add ArmorStand Item Meta
@ -95,5 +95,5 @@ index 00000000..7e4acfff
+ void setMarker(boolean marker);
+}
--
2.20.1
2.21.0

2
Spigot-API-Patches/0084-Optimize-Hoppers.patch
View File

@ -1,4 +1,4 @@
From 881a02abeb1dd87d2aa9ac12483907e236dbeab9 Mon Sep 17 00:00:00 2001
From a8182f37635d55f5c7c37fed994fbbebe10aafe4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 18 Jan 2018 01:00:27 -0500
Subject: [PATCH] Optimize Hoppers

4
Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
View File

@ -1,4 +1,4 @@
From ec25fb2dc8987362a3aa99baf07baa8fd2a79ba9 Mon Sep 17 00:00:00 2001
From 28f6a2a264377fbe9cc59db4d6c2726a71a219ba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 24 Feb 2018 00:55:52 -0500
Subject: [PATCH] Tameable#getOwnerUniqueId API
@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
an OfflinePlayer to be loaded from disk.
diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
index 0c066bdfc..be436f8df 100644
index 0c066bdf..be436f8d 100644
--- a/src/main/java/org/bukkit/entity/Tameable.java
+++ b/src/main/java/org/bukkit/entity/Tameable.java
@@ -1,5 +1,6 @@

11
Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
View File

@ -1,4 +1,4 @@
From fce0f6f5b837d223e55e3a0fd3a4420fc8a4d146 Mon Sep 17 00:00:00 2001
From 06e1fa0b4f1afd1a8b56b6f3355f922511c4bdc7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 11:43:30 -0400
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@ -6,19 +6,20 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
This will allow you to change the players name or skin on login.
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
index a0909736..6c09ea6c 100644
index c8384da6..6c09ea6c 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -3,6 +3,8 @@ package org.bukkit.event.player;
@@ -2,6 +2,9 @@ package org.bukkit.event.player;
import java.net.InetAddress;
import java.util.UUID;
+
+import com.destroystokyo.paper.profile.PlayerProfile;
+import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
@@ -26,7 +28,32 @@ public class AsyncPlayerPreLoginEvent extends Event {
@@ -25,7 +28,32 @@ public class AsyncPlayerPreLoginEvent extends Event {
}
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {

8
Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
View File

@ -1,4 +1,4 @@
From 0b00d6b950008cb1c68ae0758344a9e270ae766a Mon Sep 17 00:00:00 2001
From b5061941a927a849f90007afd1a6fea267b639ef Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 15:55:38 +0200
Subject: [PATCH] Add extended PaperServerListPingEvent
@ -8,7 +8,7 @@ and allows full control of the response sent to the client.
diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
new file mode 100644
index 000000000..0cc5dd573
index 00000000..0cc5dd57
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
@@ -0,0 +1,323 @@
@ -337,7 +337,7 @@ index 000000000..0cc5dd573
+}
diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
new file mode 100644
index 000000000..517d15238
index 00000000..517d1523
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
@@ -0,0 +1,13 @@
@ -355,7 +355,7 @@ index 000000000..517d15238
+
+}
diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
index 612958a33..bb4f7702c 100644
index 612958a3..bb4f7702 100644
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -18,4 +18,9 @@ public interface CachedServerIcon {

4
Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From cf924a9f32433bc44b212dcf3315d73869bbd45b Mon Sep 17 00:00:00 2001
From 70fd2be258f2dfcc9c3a446c98afb383d5d52a10 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 c7bc13e7d..06154a5c5 100644
index c7bc13e7..06154a5c 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;

10
Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
View File

@ -1,4 +1,4 @@
From 5a99ab919ced0b8030d9ffd958fc14ebace28152 Mon Sep 17 00:00:00 2001
From a176ce648fe16ef42bd5113e0c853e7b134e26e8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 22 Mar 2018 01:39:28 -0400
Subject: [PATCH] getPlayerUniqueId API
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 16fa78b86..19fb0e5d2 100644
index bb235ed6..db9d3f9a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -451,6 +451,20 @@ public final class Bukkit {
@@ -434,6 +434,20 @@ public final class Bukkit {
return server.getPlayer(id);
}
@ -34,10 +34,10 @@ index 16fa78b86..19fb0e5d2 100644
* Gets the plugin manager for interfacing with plugins.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index edbfa3fdc..1df58f72a 100644
index c1c1d384..d7ef680b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -380,6 +380,18 @@ public interface Server extends PluginMessageRecipient {
@@ -365,6 +365,18 @@ public interface Server extends PluginMessageRecipient {
@Nullable
public Player getPlayer(@NotNull UUID id);

4
Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
View File

@ -1,4 +1,4 @@
From 2411eb933aeb83a5124757188f75cdc6a14717e3 Mon Sep 17 00:00:00 2001
From 352d098f8b770b164eb59c7840b9b2d8290f67b2 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 19:30:20 +0200
Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
@ -29,5 +29,5 @@ index 517d1523..ffda9f6a 100644
+
}
--
2.20.1
2.21.0

4
Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
View File

@ -1,11 +1,11 @@
From 43e7d691ff499a8af5b95c032e5149ab518da36d Mon Sep 17 00:00:00 2001
From c9bb7666691300ce29eac6f766a5fe2c434504fc Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 1 Apr 2018 02:28:43 +0300
Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 037e23930..04f0e08fd 100644
index 037e2393..04f0e08f 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -465,4 +465,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

12
Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
View File

@ -1,4 +1,4 @@
From 919977c7f91757c5115ce0d257f4447480df1623 Mon Sep 17 00:00:00 2001
From 9ac21215adc9c6fb74467a43ee44d0366de3c0f1 Mon Sep 17 00:00:00 2001
From: Kyle Wood <demonwav@gmail.com>
Date: Thu, 1 Mar 2018 19:37:52 -0600
Subject: [PATCH] Add version history to version command
@ -6,7 +6,7 @@ Subject: [PATCH] Add version history to version command
diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
new file mode 100644
index 000000000..648b247ef
index 00000000..648b247e
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
@@ -0,0 +1,144 @@
@ -155,10 +155,10 @@ index 000000000..648b247ef
+ }
+}
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index 73d258763..ee07fe5e8 100644
index 5a1f9504..a36ab04c 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -34,6 +34,7 @@ import java.net.HttpURLConnection;
@@ -31,6 +31,7 @@ import java.net.HttpURLConnection;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
@ -166,7 +166,7 @@ index 73d258763..ee07fe5e8 100644
// Paper end
public class VersionCommand extends BukkitCommand {
@@ -52,6 +53,7 @@ public class VersionCommand extends BukkitCommand {
@@ -49,6 +50,7 @@ public class VersionCommand extends BukkitCommand {
if (args.length == 0) {
sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
@ -174,7 +174,7 @@ index 73d258763..ee07fe5e8 100644
sendVersion(sender);
} else {
StringBuilder name = new StringBuilder();
@@ -88,6 +90,22 @@ public class VersionCommand extends BukkitCommand {
@@ -85,6 +87,22 @@ public class VersionCommand extends BukkitCommand {
return true;
}

8
Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
View File

@ -1,4 +1,4 @@
From 86cd792a0e247654f4bfc56f712a1b2ea4a05ae6 Mon Sep 17 00:00:00 2001
From ee2733ccc823ea2e5ea9e376d81be2889c686ad9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Apr 2018 10:28:50 -0400
Subject: [PATCH] Add Ban Methods to Player Objects
@ -8,10 +8,10 @@ Allows a more logical API for banning players.
player.banPlayer("Breaking the rules");
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index cf8a2cb8a..919d1b66a 100644
index 11eedda6..aed01189 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -43,6 +43,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -42,6 +42,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
* @return true if banned, otherwise false
*/
public boolean isBanned();
@ -74,7 +74,7 @@ index cf8a2cb8a..919d1b66a 100644
/**
* Checks if this player is whitelisted or not
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 06154a5c5..a840b49d4 100644
index 06154a5c..a840b49d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1,10 +1,15 @@

4
Spigot-API-Patches/0094-EndermanEscapeEvent.patch
View File

@ -1,4 +1,4 @@
From 839ae04d99c14516adbd82e7bc0c0d56c05e8795 Mon Sep 17 00:00:00 2001
From e85a57a343deaa2b201b07c39b29222ed9e73183 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 13:14:30 -0400
Subject: [PATCH] EndermanEscapeEvent
@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
new file mode 100644
index 000000000..806112a8b
index 00000000..806112a8
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
@@ -0,0 +1,87 @@

2
Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
View File

@ -1,4 +1,4 @@
From 9bf60b25592269e84c14ab957c0274f625587ce2 Mon Sep 17 00:00:00 2001
From aa578a25fb86af68606e853a0d32821d979fce4c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 13:29:15 -0400
Subject: [PATCH] Enderman.teleportRandomly()

25
Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
View File

@ -1,4 +1,4 @@
From 7a42ac94e33e48aa35d35f1457c6cdca12edb8c9 Mon Sep 17 00:00:00 2001
From bc4ae922a5f161cda7df549eb4a3c49f6d3f3642 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's
@ -6,19 +6,20 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 84abeb216..0dcdbb59a 100644
index ac12a8fb..14f97491 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2,6 +2,8 @@ package org.bukkit;
@@ -1,6 +1,9 @@
package org.bukkit;
import java.io.File;
import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.ChunkGenerator;
+
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -507,6 +509,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -484,6 +487,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
@ -275,6 +276,20 @@ index 84abeb216..0dcdbb59a 100644
/**
* Get a list of all players in this World
*
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
index 6c09ea6c..76c4a1a6 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
return profile;
}
- /**
- * Changes the PlayerProfile the player will login as
+ /* * Changes the PlayerProfile the player will login as
* @param profile The profile to use
*/
public void setPlayerProfile(@NotNull PlayerProfile profile) {
--
2.21.0

6
Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
View File

@ -1,14 +1,14 @@
From d6c9115f6181f8d5f7a3e9e9633726599d1b384e Mon Sep 17 00:00:00 2001
From efd52e4dee3ebc0d26304f02ce2e7ac55a834e96 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 19:27:31 -0400
Subject: [PATCH] Location.isChunkLoaded() API
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 6cffda15..a2dfad2f 100644
index 39e57fe1..5c6e25c8 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -506,6 +506,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -505,6 +505,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
return this;
}

12
Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -1,4 +1,4 @@
From eaaaf19013f78b47c4cf32a9dec4ac0e5c5a5c61 Mon Sep 17 00:00:00 2001
From 4600136f94cf51d9d689734f45d66d7597262032 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 000000000..06f1602f5
index 00000000..06f1602f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +1,478 @@
@ -493,10 +493,10 @@ index 000000000..06f1602f5
+ }
+}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
index 3b2314a94..a919c6d5b 100644
index 68cb7442..69aae30a 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
@@ -84,6 +84,17 @@ public enum Particle {
@@ -92,6 +92,17 @@ public enum Particle {
return dataType;
}
@ -515,10 +515,10 @@ index 3b2314a94..a919c6d5b 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 0dcdbb59a..bec405feb 100644
index 14f97491..a709ac47 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2084,7 +2084,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2062,7 +2062,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()}
* @param <T> Type
*/

4
Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
View File

@ -1,4 +1,4 @@
From 525854c7970c2715c32cb5cd3a961d0471372f16 Mon Sep 17 00:00:00 2001
From 09083fb373c14a78dc46902e3ddb2763e23f4fea Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 20:17:44 -0400
Subject: [PATCH] EndermanAttackPlayerEvent
@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
new file mode 100644
index 000000000..f530a3d93
index 00000000..f530a3d9
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
@@ -0,0 +1,101 @@

24
Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
View File

@ -1,4 +1,4 @@
From 01b125b0fe0165e700c81c3211f8510da00461a5 Mon Sep 17 00:00:00 2001
From c81c54c9d585ac5c34aa58f474b32d44854bb8a4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 21:33:35 -0400
Subject: [PATCH] Close Plugin Class Loaders on Disable
@ -7,10 +7,10 @@ This should close more memory leaks from /reload and disabling plugins,
by closing the class loader and the jar file.
diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java
index da7839aa9..fbd65e8b0 100644
index a88733f1..6ab9cd82 100644
--- a/src/main/java/org/bukkit/plugin/PluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
@@ -78,4 +78,18 @@ public interface PluginLoader {
@@ -77,4 +77,18 @@ public interface PluginLoader {
* @param plugin Plugin to disable
*/
public void disablePlugin(@NotNull Plugin plugin);
@ -30,10 +30,10 @@ index da7839aa9..fbd65e8b0 100644
+ // Paper end - close Classloader on disable
}
diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
index a468467b4..ba4ed7ed7 100644
index 41e26451..86cc5025 100644
--- a/src/main/java/org/bukkit/plugin/PluginManager.java
+++ b/src/main/java/org/bukkit/plugin/PluginManager.java
@@ -162,6 +162,18 @@ public interface PluginManager {
@@ -161,6 +161,18 @@ public interface PluginManager {
*/
public void disablePlugin(@NotNull Plugin plugin);
@ -53,10 +53,10 @@ index a468467b4..ba4ed7ed7 100644
* Gets a {@link Permission} from its fully qualified name
*
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 12e17709c..7d4ca43b5 100644
index e4a0f938..269bb5ca 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -419,17 +419,29 @@ public final class SimplePluginManager implements PluginManager {
@@ -418,17 +418,29 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -88,7 +88,7 @@ index 12e17709c..7d4ca43b5 100644
} catch (Throwable ex) {
handlePluginException("Error occurred (in the plugin loader) while disabling "
+ plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
@@ -475,7 +487,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -474,7 +486,7 @@ public final class SimplePluginManager implements PluginManager {
public void clearPlugins() {
synchronized (this) {
@ -98,10 +98,10 @@ index 12e17709c..7d4ca43b5 100644
lookupNames.clear();
HandlerList.unregisterAll();
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index b9bf2124b..095448fe7 100644
index 024d8393..ca29394d 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -328,7 +328,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -327,7 +327,7 @@ public final class JavaPluginLoader implements PluginLoader {
} catch (Throwable ex) {
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
// Paper start - Disable plugins that fail to load
@ -110,7 +110,7 @@ index b9bf2124b..095448fe7 100644
return;
// Paper end
}
@@ -340,6 +340,12 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -339,6 +339,12 @@ public final class JavaPluginLoader implements PluginLoader {
}
public void disablePlugin(@NotNull Plugin plugin) {
@ -123,7 +123,7 @@ index b9bf2124b..095448fe7 100644
Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
if (plugin.isEnabled()) {
@@ -366,6 +372,16 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -365,6 +371,16 @@ public final class JavaPluginLoader implements PluginLoader {
for (String name : names) {
removeClass(name);
}

Some files were not shown because too many files have changed in this diff Show More