diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index d5a93f9783..c94df844eb 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -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 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"> 4.0.0 @@ -20,8 +20,9 @@ index b3369ecf..c2ec40c7 100644 + dev-SNAPSHOT + + ++ com.destroystokyo.paper + paper-api - 1.13.2-R0.1-SNAPSHOT + 1.14-pre5-SNAPSHOT jar - Spigot-API @@ -55,7 +56,7 @@ index b3369ecf..c2ec40c7 100644 @@ -76,11 +77,18 @@ index b3369ecf..c2ec40c7 100644 + jsr305 + 1.3.9 + compile ++ ++ ++ ++ com.googlecode.json-simple ++ json-simple ++ 1.1.1 ++ compile + com.google.guava -@@ -119,15 +125,12 @@ +@@ -113,15 +127,12 @@ @@ -97,7 +105,7 @@ index b3369ecf..c2ec40c7 100644 -@@ -162,6 +165,7 @@ +@@ -156,6 +167,7 @@ diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 3af13f851c..700fb9906d 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -1,4 +1,4 @@ -From af5c59b98dedbd732043a1f9155a94fb96158383 Mon Sep 17 00:00:00 2001 +From 38757c176090c45b72d90314edbd83d5be3cdffb Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ @@ -23,5 +23,5 @@ index a613cf963..f8f12595b 100644 commons-lang commons-lang -- -2.20.1 +2.21.0 diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch index e9421fd60f..353d2b5e3c 100644 --- a/Spigot-API-Patches/0003-Paper-Utils.patch +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -1,4 +1,4 @@ -From e7c9d3dadf38b1314ad78cce03635eec74035855 Mon Sep 17 00:00:00 2001 +From 291dddb5395e33cdfdc58142296dcc5e8aba73f0 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index 3cf62f1fce..63600ee9ca 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From eb2e4ca41e4f961fedc2ff7a79ce3031e50d2d07 Mon Sep 17 00:00:00 2001 +From cf5ea1965af71c23c2baae43f99cabd273c82291 Mon Sep 17 00:00:00 2001 From: Aikar 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()); -@@ -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(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> classes = new ConcurrentHashMap>(); private final List loaders = new CopyOnWriteArrayList(); @@ -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 */ diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index 35a4e75eb5..8f44eec2f5 100644 --- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch @@ -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 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(); diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index 9d19d8bd3c..e68c576be0 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,14 +1,14 @@ -From 73ffeed771aad1a3dd6af47de0875a4b20900ef7 Mon Sep 17 00:00:00 2001 +From f6ba024fcfe38fcdb7c7f5f122e26e3aa3beddba Mon Sep 17 00:00:00 2001 From: Aikar 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 diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index ab704c01a4..4f764a6f09 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From f58b39ec3dd2e77e684740b2ea13bc7d1aaecef8 Mon Sep 17 00:00:00 2001 +From cd87ab89a8a26d08b1af14028c1040a8e78695dc Mon Sep 17 00:00:00 2001 From: Byteflux 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 { diff --git a/Spigot-API-Patches/0008-Check-Paper-versions.patch b/Spigot-API-Patches/0008-Check-Paper-versions.patch index 0cbbc92fb0..b73709c746 100644 --- a/Spigot-API-Patches/0008-Check-Paper-versions.patch +++ b/Spigot-API-Patches/0008-Check-Paper-versions.patch @@ -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 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(); } diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index fcdbac30b6..7afb2fd966 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -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 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 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 8df3e63d42..deaa026ec9 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From 331efa882680033d3d69d00d3717886572cf5051 Mon Sep 17 00:00:00 2001 +From d04309c257669a7340b21f6947b503d54069c9a1 Mon Sep 17 00:00:00 2001 From: Byteflux 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(); diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index 2bfc0b9a47..b4bacf5556 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 187c890c4b97f0664edd8959a7dd28e30ad611d4 Mon Sep 17 00:00:00 2001 +From 0d98bd24755cdde12f818cae59c8fd062416f45a Mon Sep 17 00:00:00 2001 From: Byteflux 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 @@ diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index 3ea56ad8a7..5f97606715 100644 --- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -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 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 @@ diff --git a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch index efd6be7c74..74a267e0bf 100644 --- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,14 +1,14 @@ -From 42102ce2e5ad6be437319492744160cde67deed9 Mon Sep 17 00:00:00 2001 +From 30d7c520cf0004c8629f7c085639785bb5d32146 Mon Sep 17 00:00:00 2001 From: Aikar 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); diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index 44248b81ff..b12c56ca4f 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From 484c707cb1f0be319fae942a8e5fe950a9cdb409 Mon Sep 17 00:00:00 2001 +From d601b47efb8159c2a7493e065a32ea52e14d1566 Mon Sep 17 00:00:00 2001 From: kashike 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 diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 02e9adf563..7a2789cc8a 100644 --- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -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 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); diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch index a054fee72f..b91c595b24 100644 --- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From cc380b206c9722db4792168359563441f224663a Mon Sep 17 00:00:00 2001 +From 1277d8b62c6c49ac4a32c7c5e0695b2f35e7aee8 Mon Sep 17 00:00:00 2001 From: Techcable 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); } diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch index 24dc54319c..8742f88fa5 100644 --- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch +++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch @@ -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 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) { diff --git a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch index 163904e8fb..9ab6c1fcdf 100644 --- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch @@ -1,4 +1,4 @@ -From 1b07518a82ecb065e8b048fbf5dee4498d15c1be Mon Sep 17 00:00:00 2001 +From f53ab7eff0bd8214cc0185fb8bb9f19f895aa6c9 Mon Sep 17 00:00:00 2001 From: Aikar 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 - 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 - * @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 diff --git a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index 1093272840..646d49a79f 100644 --- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From 38ce360e0c5d461a283fd77ec5ebea7849e42728 Mon Sep 17 00:00:00 2001 +From 3060ab89a8aad75f91754407cbe69c61f37d984d Mon Sep 17 00:00:00 2001 From: kashike 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 { diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch index cd35e01819..206d5cdede 100644 --- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From 23b2c19d3d32bb5b75160c6aaab8cde7331b8068 Mon Sep 17 00:00:00 2001 +From 60daf9d1f89657b5556791c550ec6df03b501370 Mon Sep 17 00:00:00 2001 From: mrapple 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(); diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index 189b85d3a2..ebfef86dae 100644 --- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch @@ -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 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; diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index 32bde03ebf..12aec502f6 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 70e2fb3da9e5ab207150021fb5f3787c2dd216e8 Mon Sep 17 00:00:00 2001 +From 2a1f662e39f99ea8f90a5391754df6d155ae0ffb Mon Sep 17 00:00:00 2001 From: Techcable 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 @@ 7.1 test @@ -29,7 +29,7 @@ index 524231ecc..082f2f0c5 100644 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 { } } diff --git a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch index 086169a47a..124c395096 100644 --- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch +++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch @@ -1,4 +1,4 @@ -From cce6ae851ef26907674e191596d14c4769c953f2 Mon Sep 17 00:00:00 2001 +From eca2d156a9ab87ab92228e8ae93fa65cc65cab02 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 May 2013 20:36:58 -0400 Subject: [PATCH] Add a call helper to Event diff --git a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch index eaca94a82a..d613d9e5bb 100644 --- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch +++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch @@ -1,4 +1,4 @@ -From 897b248eb3ad7bb683e285b8c144942bc9e8e951 Mon Sep 17 00:00:00 2001 +From 9de592f68b7fb6a7f83c8873216da8a771784ebd Mon Sep 17 00:00:00 2001 From: Aikar 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 commands = new ArrayList(); 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; } diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch index 5a14d7734e..e473b22143 100644 --- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From d75c0ea906215bfa452df39659f7055ae44b2139 Mon Sep 17 00:00:00 2001 +From 85e051d778411259e9b95ab5d4b292a4eeecdd46 Mon Sep 17 00:00:00 2001 From: William 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 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 } diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch index 7b36dc0aaf..afa16d2edc 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -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 Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index ae97abc291..29b74894c7 100644 --- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -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 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 { diff --git a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch index b3006109de..b886887974 100644 --- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From a07f747027ae1079c6e620e5881667686c265c13 Mon Sep 17 00:00:00 2001 +From 908b4cc578018177445d0aa8e698025eaca3766c Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch index 93acc43a25..c5bd01846d 100644 --- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From fa357068acea340946c5984451c2889eb725c7ac Mon Sep 17 00:00:00 2001 +From 2d183ad2a2a9641486bce88f007e4fc63a8966a2 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch index 47b328d4ae..9a74470aee 100644 --- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch +++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch @@ -1,4 +1,4 @@ -From 3fe3136ff948b8361bfadeb5e0acd6836bf8831c Mon Sep 17 00:00:00 2001 +From e19f0490d85cb7478d10caf867592ab896f275ee Mon Sep 17 00:00:00 2001 From: crast 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 { - private Map> metadataMap = new HashMap>(); -+ private Map> metadataMap = new ConcurrentHashMap>(); // Paper ++ private Map> metadataMap = new java.util.concurrent.ConcurrentHashMap>(); // Paper /** * Adds a metadata value to an object. Each metadata value is owned by a -@@ -41,7 +42,9 @@ public abstract class MetadataStoreBase { +@@ -46,7 +46,9 @@ public abstract class MetadataStoreBase { entry = new WeakHashMap(1); metadataMap.put(key, entry); } @@ -34,7 +31,7 @@ index 9dbc32d8..32728628 100644 } /** -@@ -55,10 +58,11 @@ public abstract class MetadataStoreBase { +@@ -60,10 +62,11 @@ public abstract class MetadataStoreBase { * @see MetadataStore#getMetadata(Object, String) */ @NotNull @@ -49,7 +46,7 @@ index 9dbc32d8..32728628 100644 return Collections.unmodifiableList(new ArrayList(values)); } else { return Collections.emptyList(); -@@ -73,7 +77,7 @@ public abstract class MetadataStoreBase { +@@ -78,7 +81,7 @@ public abstract class MetadataStoreBase { * @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 { +@@ -94,17 +97,18 @@ public abstract class MetadataStoreBase { * 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 { +@@ -117,7 +121,7 @@ public abstract class MetadataStoreBase { * @see MetadataStore#invalidateAll(org.bukkit.plugin.Plugin) * @throws IllegalArgumentException If plugin is null */ diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index 3a229e0398..b55e65a64e 100644 --- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 0ae676c5ab5d5819d3e94e9ec554162a34fffa28 Mon Sep 17 00:00:00 2001 +From 28da1a3671afc7a8d288c6fb2a4bba46fb825c3a Mon Sep 17 00:00:00 2001 From: Aikar 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 { +@@ -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 { } } diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index 9f99f16b05..80b3d9fd0e 100644 --- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -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 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 @@ diff --git a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index ab7078a048..c1cf89e2db 100644 --- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 55a53dc9696b2fa72c0d886729547b776cd0a76a Mon Sep 17 00:00:00 2001 +From a9b5a8389171801c37d2e93174582e96087d161f Mon Sep 17 00:00:00 2001 From: kashike 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 @@ diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index e111fa2077..fa059b2d85 100644 --- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch @@ -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 Date: Fri, 4 Mar 2016 03:13:18 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index b34d90df3f..61ad54c581 100644 --- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -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 Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch index d3fc4c25d9..2b6cc14215 100644 --- a/Spigot-API-Patches/0036-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From fe6d16006ce532f553e149aa9943ba4776afad0b Mon Sep 17 00:00:00 2001 +From 823936f1edcfbf8cb8d8cf2d6ba18eb14f86b9ac Mon Sep 17 00:00:00 2001 From: Aikar 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 { diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch index 0a4127afdc..9b316c78a6 100644 --- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From d83973b95e1f261cb7d70b06771709d73a73624f Mon Sep 17 00:00:00 2001 +From 81d25abccb60bfa3607c1a70719d61b1d57f5a52 Mon Sep 17 00:00:00 2001 From: AlphaBlend 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; diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch index e98131ab68..17041e43c5 100644 --- a/Spigot-API-Patches/0038-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From a3d13870daf8d1b11309cbbf8947ae5324aed6b5 Mon Sep 17 00:00:00 2001 +From d47598b680c174abd7021e7857452886e09f4346 Mon Sep 17 00:00:00 2001 From: vemacs 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 @@ diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch index 6a437ffb3b..8cb1d6bcae 100644 --- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From c1756d0416f0a65ab568975369fccfbbf04118d1 Mon Sep 17 00:00:00 2001 +From 115bd301484371f6d9f6dfdec617abbe9df39f74 Mon Sep 17 00:00:00 2001 From: willies952002 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; diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index 944f2303d1..a8b4918183 100644 --- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 50250b4955c5c76238ed4e75479dfa1aa751ba02 Mon Sep 17 00:00:00 2001 +From dfd138e944f9160fc420ca7166f17938eeb60b78 Mon Sep 17 00:00:00 2001 From: AlphaBlend 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 @@ diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index 5b2fcef34b..3f9d14f251 100644 --- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From b82e438ee56e44088151a3448d9c6ea578145238 Mon Sep 17 00:00:00 2001 +From 619be3c6e1af342ed5b97e56b426e9767bc3c630 Mon Sep 17 00:00:00 2001 From: Techcable 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 @@ diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch index c2e7f452c6..16fb0e4125 100644 --- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 5867309b06bfe09471d79910963d912d588e860d Mon Sep 17 00:00:00 2001 +From e8135e116f16410a8b79c0520b4033553c3a237c Mon Sep 17 00:00:00 2001 From: Aikar 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 diff --git a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch index 6e6b3b38dc..0348a6d08c 100644 --- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,4 +1,4 @@ -From 6edfd35a599174ec0bc6a869b274e5f7e74b54fb Mon Sep 17 00:00:00 2001 +From daf8f6bd192c9dcbf227bc01c9a323fd59e254b8 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch index 51bf5fee9d..0e89b11435 100644 --- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 1f9c546f72d454fff0de581f0c64cdd552520787 Mon Sep 17 00:00:00 2001 +From 6326993e6b80b9f7aceb5601e7f0bd79b8824db2 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch index e1f65e3ff3..ea6671d2b1 100644 --- a/Spigot-API-Patches/0045-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From 598ca05d30454f06b4b08c9080ad038b0ffcb8d5 Mon Sep 17 00:00:00 2001 +From fee18582db9f6a66e6476a7e2ff900e082ac1659 Mon Sep 17 00:00:00 2001 From: Aikar 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; diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index b9ccbcb090..9424ae3937 100644 --- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 21f79b080ee93ae3e8f46411349e84b6bb1f87f3 Mon Sep 17 00:00:00 2001 +From 4b0ac62856b74a0a002b280d0d8a60d7a038e180 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch index b5be45bdbf..b2a5a7474e 100644 --- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 689c6a8f4240960a10dbfce71ad4b2c1dd456251 Mon Sep 17 00:00:00 2001 +From 28f5e7081c337610bbb54fffccefa9665a1b814d Mon Sep 17 00:00:00 2001 From: Aikar 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 { diff --git a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index a7916ae3a7..cf572c13a5 100644 --- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 92864aea93c48d6757f3ec929d235f61563bf0b6 Mon Sep 17 00:00:00 2001 +From 59ae19524b32260191e1daaa772623d3c08255d1 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch index a6f58b97ca..f0cc79a049 100644 --- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -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 Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch index 05a550b73a..f35f769259 100644 --- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From c257016dfd957d957c31920232cd6ba10a5db45e Mon Sep 17 00:00:00 2001 +From edba48d35f93076c75eb85e2d5f502ec17832986 Mon Sep 17 00:00:00 2001 From: kashike 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) { diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index 3c00e47ed8..1bb2b2616c 100644 --- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch @@ -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 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 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 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 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 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 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 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 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 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 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 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 { diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch index 07a90fe33e..308161eb1b 100644 --- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,4 +1,4 @@ -From 437d485cd0d2633307712d9f0c05e5ad4d809bf9 Mon Sep 17 00:00:00 2001 +From 87a96f0c2377911d526b21f1353398f3bf33198f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index d2614c2651..b445babef2 100644 --- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,4 +1,4 @@ -From bfb751c0cc1a9b5d9e913c1334d2fd5b67045402 Mon Sep 17 00:00:00 2001 +From d8be66ef36bc2d6b2a7581eeee0ccbe567ff0716 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index c9ad8ebf52..7e4c876956 100644 --- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From 75757b48a916e1c8b4d1dd2d543baae0526525e2 Mon Sep 17 00:00:00 2001 +From db41e869a62491d7136eccdf5032653ac17c8c4d Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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 @@ diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index f56840a0bf..3adcd35427 100644 --- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From 935c2498cb5d9d4920e90ab90ff786114a1d114f Mon Sep 17 00:00:00 2001 +From ec4a76274dc2d8fa737b1cca310d75c4f4628bc7 Mon Sep 17 00:00:00 2001 From: Sweepyoface 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 @@ diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 0786ec966c..4ac0ea2e5b 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 7def00d86d228835b95d99b7526e25e62064723a Mon Sep 17 00:00:00 2001 +From c3fa1c3006bf1c9e6f786581aac8fe876653678c Mon Sep 17 00:00:00 2001 From: Aikar 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(); diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index ffa6216371..361a0cf4df 100644 --- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch +++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch @@ -1,11 +1,11 @@ -From 5fcee5665b665276220dc2a9eedb5588880b2f9d Mon Sep 17 00:00:00 2001 +From 0c0dcf70779a634834277770a644ce513a240d5f Mon Sep 17 00:00:00 2001 From: Aikar 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 diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch index 5270fd596a..1137d32e5d 100644 --- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 0e47d3ccc037ae116f442c963aef0ff5115a4186 Mon Sep 17 00:00:00 2001 +From 899ca9c0ccac00c3c564243608ed32aaa5a0fb4f Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index 68b46f29e3..c2f5b5d8d4 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,14 +1,14 @@ -From 8a669ab697d0c15360d7618826c81c89ca2cb3c8 Mon Sep 17 00:00:00 2001 +From e9cc77d6cf44ce00f1dd2c47535573e04eaf56dc Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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(); diff --git a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch index aefa6df2d2..953cc3b4fe 100644 --- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 01ff2f70c2ef6bafe4b99eb940d63bb256526819 Mon Sep 17 00:00:00 2001 +From 27d64c363e7fdb673502b22a0763161af9aa4df6 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch index 0e170da04e..d364a75843 100644 --- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 20eb853456b944fc4eb760f9ee5c6bfa3433513b Mon Sep 17 00:00:00 2001 +From ae030eb68664e246e3610cd6e0b9eb66c7b75bc3 Mon Sep 17 00:00:00 2001 From: Aikar 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 { diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index b0bad345f0..80b4ad0a66 100644 --- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From 35bbd72e452d3c31afe5217706a2a60df856117f Mon Sep 17 00:00:00 2001 +From 1083cf344326c8c77207bab66a92c2d06d4f9f7d Mon Sep 17 00:00:00 2001 From: Aikar 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 { diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index 81d24e0344..52d8a0688c 100644 --- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From c76cd792c71b03975683e5660613d55613c025f8 Mon Sep 17 00:00:00 2001 +From 0ee9a5961484c254e1c97c7ce215a9a48da3cb90 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index 1aca737c1a..e30a69736b 100644 --- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,23 +1,24 @@ -From 482ec24d923b8dc78080d5edcfe1422087035346 Mon Sep 17 00:00:00 2001 +From 7e6884097c480972ee63619950c2f45be6042865 Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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() { diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch index 1f0cffd326..ae6efd5324 100644 --- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,14 +1,14 @@ -From 8b825df13b6aaa53037a89ec4c1c05b4b6ea4173 Mon Sep 17 00:00:00 2001 +From ab9a652b2d9f9d0d0e9015a631a77e61a42499b6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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(); diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch index 4767e6d40f..13f78a4d89 100644 --- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch +++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch @@ -1,4 +1,4 @@ -From 6b3735bc5ec6609bb14a78335eaa7ea5c5574db4 Mon Sep 17 00:00:00 2001 +From b733f821905e9d3385d6e20ff17a6a07e652741a Mon Sep 17 00:00:00 2001 From: Minecrell 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"); diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index c6aab3f05a..944ba65ec4 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 4d33389d2be22a2955605e09a43ffd1109a3eddb Mon Sep 17 00:00:00 2001 +From f40e94e3adcc3372c06c1cec02bce37804413e93 Mon Sep 17 00:00:00 2001 From: Minecrell 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 @@ 17.0.0 provided @@ -32,10 +32,10 @@ index 082f2f0c5..13cdc25f8 100644 junit 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(); diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index 7aed5d070d..328f0ae158 100644 --- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -1,4 +1,4 @@ -From ab3fa3cb5c5e5389c8fb4900b9e5fb6800e11be1 Mon Sep 17 00:00:00 2001 +From 8cc0cf9092f9b58e9f7cf6f1cd8b5bda990b7d3d Mon Sep 17 00:00:00 2001 From: Minecrell 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; diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 5872e058a1..2a767e5106 100644 --- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -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 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 @@ diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch index a27aad40c4..2ebd6adb04 100644 --- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 288a297fa9c66575aca683e0f2cb693bc119a3c2 Mon Sep 17 00:00:00 2001 +From f0f9d92355cf99f298ffb63c693b6c9b410052ed Mon Sep 17 00:00:00 2001 From: Minecrell 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; diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index eeac729132..83a09c351f 100644 --- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 72e0411e853da36205ab8e3d24041de5d7b80ac5 Mon Sep 17 00:00:00 2001 +From 986fa3f55231a220bf061a5c79084e00a73396d0 Mon Sep 17 00:00:00 2001 From: pkt77 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 @@ diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch index a7e8b099aa..85172f4f73 100644 --- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From f88c6e674e15899aa75a38b121eda2ee7e3f8cd2 Mon Sep 17 00:00:00 2001 +From fac60bf80e0ed4e37e2f15a662fcabc2881e80ba Mon Sep 17 00:00:00 2001 From: Aikar 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(); diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index f10fc7ecb9..1300923a32 100644 --- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From aaede4321cd33af05db4d80ad1e75d17782fd65b Mon Sep 17 00:00:00 2001 +From c9fa8f5324751e3b6443539634b888fffdf3044b Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch index d5fce9b9fc..521935576a 100644 --- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch +++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch @@ -1,4 +1,4 @@ -From fdf1b7fd4ed6b12ec92df144e1961d3e5b198d61 Mon Sep 17 00:00:00 2001 +From 686c76fc32425a5fd568cb11693f89c798055456 Mon Sep 17 00:00:00 2001 From: Aikar 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(); diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index dfa42dfe05..9afab0cf90 100644 --- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 0bd98a68ee81d13dcf28e6f6ef85eb63920b46f4 Mon Sep 17 00:00:00 2001 +From 25b565fcee0be8aba234ef72d4e6b5ad303ef72a Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index 7f0b1dd1f5..5f0e6a029a 100644 --- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 014342436b9d0a522d4948efe3f699fef8b8cc15 Mon Sep 17 00:00:00 2001 +From 9abbd1fad3e1556130905142de3c6649688f2993 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch index 87bcde4dcc..b0dedb5f22 100644 --- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From e86f55218e61959a7851efd9453a5785e1eaef93 Mon Sep 17 00:00:00 2001 +From 323d8fa0173c68391c1e828cdbf4ae6ee6cb555c Mon Sep 17 00:00:00 2001 From: Aikar 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 diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 93da7d5fab..31cb2a0265 100644 --- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 35452d656b653b45dd767d53bae2d6c1e87a81d9 Mon Sep 17 00:00:00 2001 +From 69201b817c39c9959a8e0154f99be75bf825a72d Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index 314ec62396..79c3d3a286 100644 --- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 1f5cbf18a8beea7d63e03e6c2fb786985f581f03 Mon Sep 17 00:00:00 2001 +From 65cbe82faadc65085e95f13e83fc7e6a018100d4 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch index 9274db95c2..4bf79bf691 100644 --- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 907a0b84b6a2bfa31356bf1d72f7a8210be4e612 Mon Sep 17 00:00:00 2001 +From 35a4d7387a22fe69f696b54ea874cb44d6f77a06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:29:28 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index e9a02454be..7ca44fd0a3 100644 --- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch +++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 53a81651f2f57c8d8b5a104b7d95a5c7287881f7 Mon Sep 17 00:00:00 2001 +From 85b20f933f2c008a358b790e2a554b69e34d12bf Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index 3e77e4397b..6433159fac 100644 --- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From c53db31449879e3307930215473d83a9e14440f7 Mon Sep 17 00:00:00 2001 +From cbfc65bf36d39478f9809431b9610ebec21bd699 Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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 @@ diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index c10f68e87d..fe05691620 100644 --- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch @@ -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 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 diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch index aded0ec200..5079057f46 100644 --- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 881a02abeb1dd87d2aa9ac12483907e236dbeab9 Mon Sep 17 00:00:00 2001 +From a8182f37635d55f5c7c37fed994fbbebe10aafe4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index be7e89e9a1..b51ed9912d 100644 --- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From ec25fb2dc8987362a3aa99baf07baa8fd2a79ba9 Mon Sep 17 00:00:00 2001 +From 28f6a2a264377fbe9cc59db4d6c2726a71a219ba Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index e752cb511d..2e05d2b50e 100644 --- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From fce0f6f5b837d223e55e3a0fd3a4420fc8a4d146 Mon Sep 17 00:00:00 2001 +From 06e1fa0b4f1afd1a8b56b6f3355f922511c4bdc7 Mon Sep 17 00:00:00 2001 From: Aikar 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) { diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index a1da6121fb..9cc9cbe2fc 100644 --- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 0b00d6b950008cb1c68ae0758344a9e270ae766a Mon Sep 17 00:00:00 2001 +From b5061941a927a849f90007afd1a6fea267b639ef Mon Sep 17 00:00:00 2001 From: Minecrell 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 { diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index 941c654920..fca1a9f80e 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From cf924a9f32433bc44b212dcf3315d73869bbd45b Mon Sep 17 00:00:00 2001 +From 70fd2be258f2dfcc9c3a446c98afb383d5d52a10 Mon Sep 17 00:00:00 2001 From: Aikar 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; diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index 1449829d98..c02efc7c4f 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 5a99ab919ced0b8030d9ffd958fc14ebace28152 Mon Sep 17 00:00:00 2001 +From a176ce648fe16ef42bd5113e0c853e7b134e26e8 Mon Sep 17 00:00:00 2001 From: Aikar 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); diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch index 07a8d55fd0..266106e295 100644 --- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 2411eb933aeb83a5124757188f75cdc6a14717e3 Mon Sep 17 00:00:00 2001 +From 352d098f8b770b164eb59c7840b9b2d8290f67b2 Mon Sep 17 00:00:00 2001 From: Minecrell 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 diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch index 96d5e3bc79..f97136da56 100644 --- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch @@ -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 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 diff --git a/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch b/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch index a146a005b0..9f54dd5c53 100644 --- a/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch +++ b/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch @@ -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 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; } diff --git a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch index e216c3a3ff..e164909487 100644 --- a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 86cd792a0e247654f4bfc56f712a1b2ea4a05ae6 Mon Sep 17 00:00:00 2001 +From ee2733ccc823ea2e5ea9e376d81be2889c686ad9 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0094-EndermanEscapeEvent.patch b/Spigot-API-Patches/0094-EndermanEscapeEvent.patch index d38f3d4930..e084786675 100644 --- a/Spigot-API-Patches/0094-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0094-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 839ae04d99c14516adbd82e7bc0c0d56c05e8795 Mon Sep 17 00:00:00 2001 +From e85a57a343deaa2b201b07c39b29222ed9e73183 Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch index 3c60c66b62..ef76318c03 100644 --- a/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 9bf60b25592269e84c14ab957c0274f625587ce2 Mon Sep 17 00:00:00 2001 +From aa578a25fb86af68606e853a0d32821d979fce4c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() diff --git a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch index d523aab976..43e940049c 100644 --- a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch +++ b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch @@ -1,4 +1,4 @@ -From 7a42ac94e33e48aa35d35f1457c6cdca12edb8c9 Mon Sep 17 00:00:00 2001 +From bc4ae922a5f161cda7df549eb4a3c49f6d3f3642 Mon Sep 17 00:00:00 2001 From: Aikar 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 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 diff --git a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch index d3a1a2a2c7..2e363de560 100644 --- a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch @@ -1,14 +1,14 @@ -From d6c9115f6181f8d5f7a3e9e9633726599d1b384e Mon Sep 17 00:00:00 2001 +From efd52e4dee3ebc0d26304f02ce2e7ac55a834e96 Mon Sep 17 00:00:00 2001 From: Aikar 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; } diff --git a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch index 9ab0df8d53..19169de6b7 100644 --- a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From eaaaf19013f78b47c4cf32a9dec4ac0e5c5a5c61 Mon Sep 17 00:00:00 2001 +From 4600136f94cf51d9d689734f45d66d7597262032 Mon Sep 17 00:00:00 2001 From: Aikar 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 Type */ diff --git a/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch index 0df5252b7e..b5ce8bfe2c 100644 --- a/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 525854c7970c2715c32cb5cd3a961d0471372f16 Mon Sep 17 00:00:00 2001 +From 09083fb373c14a78dc46902e3ddb2763e23f4fea Mon Sep 17 00:00:00 2001 From: Aikar 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 @@ diff --git a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch index c18cb69d55..39ede31862 100644 --- a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch +++ b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch @@ -1,4 +1,4 @@ -From 01b125b0fe0165e700c81c3211f8510da00461a5 Mon Sep 17 00:00:00 2001 +From c81c54c9d585ac5c34aa58f474b32d44854bb8a4 Mon Sep 17 00:00:00 2001 From: Aikar 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); } diff --git a/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch index e0fd14416b..474eba4f88 100644 --- a/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From d9c3debc9d0a4123e4a6d56fc4b7154b5f2fb1e8 Mon Sep 17 00:00:00 2001 +From 8ad457fe22064cb95a98d944c39b121fa5d5e9f7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java new file mode 100644 -index 000000000..fbbace36d +index 00000000..fbbace36 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java @@ -0,0 +1,70 @@ @@ -83,7 +83,7 @@ index 000000000..fbbace36d +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java new file mode 100644 -index 000000000..6ef6367b6 +index 00000000..6ef6367b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -0,0 +1,33 @@ diff --git a/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch index 0f6658d17c..f71ef2b60a 100644 --- a/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 456f51c1047c446b824766799d6883ab066ee8bb Mon Sep 17 00:00:00 2001 +From fc6b5dba1f829790033dc13af8176268da944946 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java -index 6ef6367b6..688a596aa 100644 +index 6ef6367b..688a596a 100644 --- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -1,29 +1,77 @@ diff --git a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch index 69ac9268c3..e6aae2e59a 100644 --- a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From f518eb3d1040b4b8131c289ceecfe47d04561b21 Mon Sep 17 00:00:00 2001 +From 0701304bb671bd961643e7ff8510d97304f10307 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -6,10 +6,10 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Convert location objects to their block coordinates, or the center of the block diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index a2dfad2f4..3387fb477 100644 +index 5c6e25c8..34e90167 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -507,6 +507,31 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -506,6 +506,31 @@ public class Location implements Cloneable, ConfigurationSerializable { } public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper diff --git a/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch index 686f565c93..3b9cd0c2bf 100644 --- a/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch @@ -1,14 +1,14 @@ -From 8d34f2367c37cd9a2f1e78b4698332157ae7b670 Mon Sep 17 00:00:00 2001 +From 3bcb7a82269c5b46d201e08b1a0f48eef8af6587 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java -index d57450c95..4125a024e 100644 +index a0529fbe..3782d84a 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java -@@ -103,6 +103,33 @@ public class PotionEffect implements ConfigurationSerializable { +@@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable { this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true))); } diff --git a/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch index 786436d9d1..eff481b2a8 100644 --- a/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From c610e708384fe18f6b8c7dfda74ca0f8cc0f344e Mon Sep 17 00:00:00 2001 +From 7d23434a72c7cf227540dea784c7d10998d7ffb7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -7,7 +7,7 @@ Control what potion the witch readies to use diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java new file mode 100644 -index 000000000..5351b523d +index 00000000..5351b523 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java @@ -0,0 +1,80 @@ diff --git a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch index be5e4f44b6..b7a427dc17 100644 --- a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From ec59e7df8881e52fb38e05e99c430effd5afb875 Mon Sep 17 00:00:00 2001 +From 669ab2ed43b68285e1add1c3bfb0a33493dacbdd Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 3ff3458e7..345dc8bdc 100644 +index 3ff3458e..345dc8bd 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -602,5 +602,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { diff --git a/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch index bd565f7967..6dd4b36974 100644 --- a/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From d21bbfb71595a553f4f6208478832056bc8cb233 Mon Sep 17 00:00:00 2001 +From 99b0ff6cfea815ea98af9ff7e40946bff0623e33 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java new file mode 100644 -index 000000000..bfc69a43c +index 00000000..bfc69a43 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java @@ -0,0 +1,31 @@ diff --git a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch index 965805adbf..f66c7404f0 100644 --- a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch @@ -1,14 +1,14 @@ -From 56efcbe4b06d13be28be441121dc0745acfb9132 Mon Sep 17 00:00:00 2001 +From 31cbc2b364b29e853ed7bac33e882dcc773d3c84 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 706d8f52..2fc50705 100644 +index 49c79028..01c49322 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -491,5 +491,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -490,5 +490,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param arrows Number of arrows to stick in this entity */ void setArrowsStuck(int arrows); diff --git a/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 69445d39c5..30d1905ae5 100644 --- a/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 08658058b274e66ee6da649109aadb0c8094e4ce Mon Sep 17 00:00:00 2001 +From fd5b30936be418b1270633aa80c6df0c12665ab6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:52:04 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,10 +6,18 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -index 57f6203d4..efde16174 100644 +index ec12b57e..d086f331 100644 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -@@ -18,9 +18,30 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable { +@@ -2,6 +2,7 @@ package org.bukkit.event.entity; + + import org.bukkit.entity.Entity; + import org.bukkit.entity.LivingEntity; ++import org.bukkit.entity.Projectile; // Paper + import org.bukkit.event.Cancellable; + import org.bukkit.event.HandlerList; + import org.bukkit.inventory.ItemStack; +@@ -17,9 +18,30 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable { private Entity projectile; private final float force; private boolean cancelled; @@ -22,17 +30,18 @@ index 57f6203d4..efde16174 100644 + public boolean getConsumeArrow() { + return consumeArrow; + } - ++ + @NotNull + public ItemStack getArrowItem() { + return arrowItem; + } + + @Deprecated - public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Projectile projectile, final float force) { ++ public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Projectile projectile, final float force) { + this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force); + } -+ + +- public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) { + public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull ItemStack arrowItem, @NotNull final Projectile projectile, final float force) { super(shooter); + this.arrowItem = arrowItem; diff --git a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch index 25188c6715..117524c547 100644 --- a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch @@ -1,14 +1,14 @@ -From 3d1f2e17aa510ecd93069a5adc6ad19795c73797 Mon Sep 17 00:00:00 2001 +From eec21f171a7518257567e49002a79e0eeea026ce Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 18 Jun 2018 00:41:46 -0500 Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 3387fb477..768af6b15 100644 +index 34e90167..f3ae58ee 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -10,6 +10,15 @@ import org.bukkit.util.Vector; +@@ -9,6 +9,15 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -24,7 +24,7 @@ index 3387fb477..768af6b15 100644 /** * Represents a 3-dimensional position in a world. *
-@@ -531,6 +540,246 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -530,6 +539,246 @@ public class Location implements Cloneable, ConfigurationSerializable { centerLoc.setZ(getBlockZ() + 0.5); return centerLoc; } diff --git a/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch index 16beeac2a7..e59a33e41f 100644 --- a/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 3cda6a60572fc259cad45a8139459d64f5e612de Mon Sep 17 00:00:00 2001 +From 9f64f378b903f5fe1a7e728c6181ed12d6ec1cfb Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java new file mode 100644 -index 000000000..5d04a22fd +index 00000000..5d04a22f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java @@ -0,0 +1,93 @@ diff --git a/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch index d3b67f5404..e9ab6b9bc9 100644 --- a/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From e511b78eb2bf54d781d89bcfb556bf3c152242ac Mon Sep 17 00:00:00 2001 +From 30f32c15edc8a830818b6427009ed843cd06daae Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java new file mode 100644 -index 000000000..9efecabab +index 00000000..9efecaba --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java @@ -0,0 +1,82 @@ diff --git a/Spigot-API-Patches/0113-Expand-Explosions-API.patch b/Spigot-API-Patches/0113-Expand-Explosions-API.patch index d4593a6e8f..281e018da4 100644 --- a/Spigot-API-Patches/0113-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0113-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 9724f0d2d9d912f2d6c523950ddb5257b4e793df Mon Sep 17 00:00:00 2001 +From 6014a368344b93d8a67207acca5dce642311dd2b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API @@ -6,18 +6,18 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 768af6b15..e57e22a21 100644 +index f3ae58ee..b5a6ac16 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -5,6 +5,7 @@ import java.util.Map; - +@@ -4,6 +4,7 @@ import java.util.HashMap; + import java.util.Map; import org.bukkit.block.Block; import org.bukkit.configuration.serialization.ConfigurationSerializable; +import org.bukkit.entity.Entity; // Paper import org.bukkit.util.NumberConversions; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -@@ -541,6 +542,87 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -540,6 +541,87 @@ public class Location implements Cloneable, ConfigurationSerializable { return centerLoc; } @@ -106,10 +106,10 @@ index 768af6b15..e57e22a21 100644 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index bec405feb..dcc47cde5 100644 +index a709ac47..9579437b 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1210,6 +1210,102 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1188,6 +1188,102 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public boolean createExplosion(@NotNull Location loc, float power, boolean setFire); diff --git a/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch index 2ba3d88df3..1a9e4daa62 100644 --- a/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -1,23 +1,23 @@ -From 34a7e90eaaf6385e619588c697a7856732b44ffc Mon Sep 17 00:00:00 2001 +From 99b83c34aed53dcef145a8e02978b84778915778 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 22 Jun 2018 22:59:18 -0400 Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 345dc8bdc..1b19f8215 100644 +index 7a4ace35..72e268c1 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -2,7 +2,9 @@ package org.bukkit.inventory; import com.google.common.collect.ImmutableMap; import java.util.LinkedHashMap; -+import java.util.List; ++import java.util.List; // Paper import java.util.Map; -+import java.util.Set; - ++import java.util.Set; // Paper import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; + import org.bukkit.Material; @@ -610,5 +612,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { // Requires access to NMS return ensureServerConversions().getMaxItemUseDuration(); diff --git a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch index 00debe461f..42dbfffc94 100644 --- a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From f2d5cff8c7433166cab3ee3e4558b43f7ac9ded1 Mon Sep 17 00:00:00 2001 +From 2c5fc6a638f23f4ca9017d194449797b14f00aab Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 2fc507052..863d727d0 100644 +index 01c49322..95567daa 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -11,6 +11,7 @@ import org.bukkit.World; +@@ -10,6 +10,7 @@ import org.bukkit.World; import org.bukkit.attribute.Attributable; import org.bukkit.block.Block; import org.bukkit.inventory.EntityEquipment; @@ -17,7 +17,7 @@ index 2fc507052..863d727d0 100644 import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -@@ -505,5 +506,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -504,5 +505,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param delay Delay in ticks */ void setShieldBlockingDelay(int delay); diff --git a/Spigot-API-Patches/0116-RangedEntity-API.patch b/Spigot-API-Patches/0116-RangedEntity-API.patch index 7a62114d68..d3056b5743 100644 --- a/Spigot-API-Patches/0116-RangedEntity-API.patch +++ b/Spigot-API-Patches/0116-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 4edc97bf2dd769c484114310a58e1588666e9a12 Mon Sep 17 00:00:00 2001 +From b4ed810ded91c4e5d07423ad94e4ffc685a89257 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java new file mode 100644 -index 000000000..f2e3233a3 +index 00000000..f2e3233a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java @@ -0,0 +1,31 @@ @@ -44,7 +44,7 @@ index 000000000..f2e3233a3 + } +} diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java -index 7c92c431b..14e6c5ee0 100644 +index 7c92c431..14e6c5ee 100644 --- a/src/main/java/org/bukkit/entity/Illusioner.java +++ b/src/main/java/org/bukkit/entity/Illusioner.java @@ -1,6 +1,10 @@ @@ -60,7 +60,7 @@ index 7c92c431b..14e6c5ee0 100644 + +} diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java -index c43854298..d23226ccb 100644 +index c4385429..d23226cc 100644 --- a/src/main/java/org/bukkit/entity/Llama.java +++ b/src/main/java/org/bukkit/entity/Llama.java @@ -1,12 +1,13 @@ @@ -79,7 +79,7 @@ index c43854298..d23226ccb 100644 /** * Represents the base color that the llama has. diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 2ac30c0f6..d42a4e12c 100644 +index 2ac30c0f..d42a4e12 100644 --- a/src/main/java/org/bukkit/entity/Skeleton.java +++ b/src/main/java/org/bukkit/entity/Skeleton.java @@ -2,11 +2,12 @@ package org.bukkit.entity; @@ -97,7 +97,7 @@ index 2ac30c0f6..d42a4e12c 100644 /** * Gets the current type of this skeleton. diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java -index 818efe2a4..10f8f6d45 100644 +index 818efe2a..10f8f6d4 100644 --- a/src/main/java/org/bukkit/entity/Snowman.java +++ b/src/main/java/org/bukkit/entity/Snowman.java @@ -1,9 +1,11 @@ @@ -114,7 +114,7 @@ index 818efe2a4..10f8f6d45 100644 /** * Gets whether this snowman is in "derp mode", meaning it is not wearing a diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index 9c5dc1f97..4b27f6890 100644 +index b4343903..aa88aede 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -1,7 +1,9 @@ @@ -125,11 +125,11 @@ index 9c5dc1f97..4b27f6890 100644 /** * Represents a Witch */ --public interface Witch extends Monster { -+public interface Witch extends Monster, RangedEntity { // Paper +-public interface Witch extends Raider { ++public interface Witch extends Raider, RangedEntity { // Paper } diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 3bc332ee7..426d36933 100644 +index 3bc332ee..426d3693 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java @@ -1,7 +1,9 @@ @@ -143,6 +143,19 @@ index 3bc332ee7..426d36933 100644 -public interface Wither extends Monster, Boss { +public interface Wither extends Monster, Boss, RangedEntity { // Paper } +diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java +index 72e268c1..76da06d1 100644 +--- a/src/main/java/org/bukkit/inventory/ItemStack.java ++++ b/src/main/java/org/bukkit/inventory/ItemStack.java +@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; + import org.jetbrains.annotations.Nullable; + + /** +- * Represents a stack of items ++ * Represents a stack of item + */ + public class ItemStack implements Cloneable, ConfigurationSerializable { + private Material type = Material.AIR; -- 2.21.0 diff --git a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch index 46c046f89e..58f0e31f1d 100644 --- a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch @@ -1,14 +1,14 @@ -From 99845fa0f02668b5e2832bf55b82ad4ac15a7fe0 Mon Sep 17 00:00:00 2001 +From 50730348c82fbebf291c65472b8882a41687005d Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:07:16 +0200 Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index dcc47cde5..5ccd8500d 100644 +index 9579437b..8d23ad74 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -785,6 +785,17 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -763,6 +763,17 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z); diff --git a/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch index 1d8a4ba3be..7b6d055003 100644 --- a/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 6e0d5f987f21ccf9cb93bb8fafaece4a7e066736 Mon Sep 17 00:00:00 2001 +From 7598e855d8a3861b325248812b427feb4a19160d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:52:52 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 04f0e08fd..a372c74b8 100644 +index 04f0e08f..a372c74b 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -27,7 +27,7 @@ index 04f0e08fd..a372c74b8 100644 * Returns the ItemStack currently in your hand, can be empty. * diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java -index 5861247c1..21ad8888c 100644 +index 5861247c..21ad8888 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java @@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull; diff --git a/Spigot-API-Patches/0119-Entity-getChunk-API.patch b/Spigot-API-Patches/0119-Entity-getChunk-API.patch index 83bf01b179..83112a3ec0 100644 --- a/Spigot-API-Patches/0119-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0119-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From ab777ae0adb9a8e9eaaef3e76bb9b531b0cb4d64 Mon Sep 17 00:00:00 2001 +From cf05fa82929aff70c3a6a4a14b66391338dbc359 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -6,18 +6,18 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6dd0623bf..81d92145e 100644 +index a1edcf02..9391bbf0 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1,5 +1,7 @@ - package org.bukkit.entity; - -+import org.bukkit.Chunk; -+import org.bukkit.Location; +@@ -3,6 +3,7 @@ package org.bukkit.entity; + import java.util.List; + import java.util.Set; + import java.util.UUID; ++import org.bukkit.Chunk; // Paper import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -611,5 +613,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable { +@@ -610,5 +611,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable { * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); diff --git a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch index 57049c6017..8e8f9907bc 100644 --- a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch @@ -1,4 +1,4 @@ -From 607c463ca170254672f70fd10b81157db6b8b114 Mon Sep 17 00:00:00 2001 +From 53f3e607544800706ae1f1f01b6a6f292acb6fa6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 15:07:02 -0500 Subject: [PATCH] Add an asterisk to legacy API plugins @@ -7,10 +7,10 @@ Not here to name and shame, only so server admins can be aware of which plugins have and haven't been updated. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index a4aabfe7f..f462b631b 100644 +index 247d194f..b4c173df 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -67,4 +67,10 @@ public interface UnsafeValues { +@@ -69,4 +69,10 @@ public interface UnsafeValues { * @return true if a file matching this key was found and deleted */ boolean removeAdvancement(NamespacedKey key); @@ -22,7 +22,7 @@ index a4aabfe7f..f462b631b 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index d4e74d292..6cfd9f3c6 100644 +index d4e74d29..6cfd9f3c 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -41,7 +41,14 @@ public class PluginsCommand extends BukkitCommand { @@ -42,10 +42,10 @@ index d4e74d292..6cfd9f3c6 100644 StringBuilder pluginList = new StringBuilder(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 095448fe7..e91cb2c78 100644 +index ca29394d..ed7455c3 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -@@ -312,7 +312,14 @@ public final class JavaPluginLoader implements PluginLoader { +@@ -311,7 +311,14 @@ public final class JavaPluginLoader implements PluginLoader { Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader"); if (!plugin.isEnabled()) { diff --git a/Spigot-API-Patches/0121-EnderDragon-Events.patch b/Spigot-API-Patches/0121-EnderDragon-Events.patch index 07b4525e80..1935c24113 100644 --- a/Spigot-API-Patches/0121-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0121-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From ca66c23763bf5a5e99d61b42651f0070e61b931d Mon Sep 17 00:00:00 2001 +From 926e195e6d693c4a3845dde51d876efb8ca25231 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java new file mode 100644 -index 000000000..118c7b677 +index 00000000..118c7b67 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java @@ -0,0 +1,79 @@ @@ -91,7 +91,7 @@ index 000000000..118c7b677 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java new file mode 100644 -index 000000000..1915177f4 +index 00000000..1915177f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java @@ -0,0 +1,61 @@ @@ -158,7 +158,7 @@ index 000000000..1915177f4 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java new file mode 100644 -index 000000000..8414bd805 +index 00000000..8414bd80 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java @@ -0,0 +1,61 @@ diff --git a/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch index d7908ed395..6fdce65966 100644 --- a/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From 6739996e04cca7984ebc73aedb8b09594575bee3 Mon Sep 17 00:00:00 2001 +From 68bfbd197cb7e1d79da309b3f43ce996b23bab9a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java new file mode 100644 -index 000000000..9074b2ede +index 00000000..9074b2ed --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java @@ -0,0 +1,83 @@ diff --git a/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch index 54cc279da8..f02baf8c9c 100644 --- a/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From e499534f205a08bf1a17dcde59e8b0339d4c1b27 Mon Sep 17 00:00:00 2001 +From dd9a628828a124c4c4f22186b59d2d332c657241 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java new file mode 100644 -index 000000000..e9a76a25f +index 00000000..e9a76a25 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java @@ -0,0 +1,85 @@ diff --git a/Spigot-API-Patches/0124-EntityTransformedEvent.patch b/Spigot-API-Patches/0124-EntityTransformedEvent.patch index bf9515f12e..e3795f74ac 100644 --- a/Spigot-API-Patches/0124-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0124-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 7d3567b6c8679fa401dd7a9a51f1d538b956e539 Mon Sep 17 00:00:00 2001 +From c6e1d0020fdf92be2748e4ddf694c15e7881e6f5 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java new file mode 100644 -index 000000000..12194f1fc +index 00000000..12194f1f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java @@ -0,0 +1,92 @@ diff --git a/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch index 594965c10c..90e5ad638b 100644 --- a/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 33a1ab867848b574a4304c81f15f9d352c2b60cc Mon Sep 17 00:00:00 2001 +From 3014696abf81408031ce208b526d2d964b3e68c7 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:03 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 387d04e5b..492df420b 100644 +index 387d04e5..492df420 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -288,5 +288,21 @@ public interface ArmorStand extends LivingEntity { diff --git a/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch index 8b34f69068..f18f9eaca8 100644 --- a/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From ea94db0d6ee4a6a60472c9445d53004b075f60ad Mon Sep 17 00:00:00 2001 +From c20b900710f100a5695afa6cd33c30f7d8fae5a1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 -index 000000000..d79dbcd68 +index 00000000..d79dbcd6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,47 @@ @@ -58,7 +58,7 @@ index 000000000..d79dbcd68 +} + diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java -index b2c6b6a86..ba9983463 100644 +index b2c6b6a8..ba998346 100644 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -3,4 +3,12 @@ package org.bukkit.entity; diff --git a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch index acde25a6be..310e970187 100644 --- a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch +++ b/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch @@ -1,4 +1,4 @@ -From 82398c9e4afd78705fc7d325811865fc13522765 Mon Sep 17 00:00:00 2001 +From b37d200e4fc162202173c684bbba942d197bc032 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -6,10 +6,10 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index e57e22a21..84b7d93cf 100644 +index b5a6ac16..8e444f7f 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -519,6 +519,54 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -518,6 +518,54 @@ public class Location implements Cloneable, ConfigurationSerializable { public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper // Paper start diff --git a/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch index 13851c51fc..28f3b68141 100644 --- a/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From 84ef806009cf85bcfd9231c9f87535f98dee2d74 Mon Sep 17 00:00:00 2001 +From 9fb611dc9f3489629214f4962308ef498358ccc9 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 492df420b..e7f71e65e 100644 +index 492df420..e7f71e65 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -1,5 +1,6 @@ diff --git a/Spigot-API-Patches/0129-AnvilDamageEvent.patch b/Spigot-API-Patches/0129-AnvilDamageEvent.patch index b62f840783..94a790ac84 100644 --- a/Spigot-API-Patches/0129-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0129-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From ab42858dbd563351bcf17054a6bb46b72892a821 Mon Sep 17 00:00:00 2001 +From dd237c9ad1f04c98b305173a600865b2dc7e5896 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java new file mode 100644 -index 000000000..a83c286c1 +index 00000000..a83c286c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java @@ -0,0 +1,148 @@ diff --git a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch index c0b07bee89..5fe8dc362e 100644 --- a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From 0c86016a1fb9b9fe7f97b02ce776db7f308c5381 Mon Sep 17 00:00:00 2001 +From efab2286b27530bc51746d79927a19d4b75d0777 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 00:32:05 -0400 Subject: [PATCH] Remove deadlock risk in firing async events @@ -15,11 +15,24 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable +diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java +index 9391bbf0..5098eade 100644 +--- a/src/main/java/org/bukkit/entity/Entity.java ++++ b/src/main/java/org/bukkit/entity/Entity.java +@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; + */ + public interface Entity extends Metadatable, CommandSender, Nameable { + +- /** ++ /* + * Gets the entity's current position + * + * @return a new copy of Location containing the position of this entity diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 7d4ca43b5..9ec042fd7 100644 +index 269bb5ca..5d99a41a 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -@@ -392,7 +392,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -391,7 +391,7 @@ public final class SimplePluginManager implements PluginManager { * @param plugin Plugin to check * @return true if the plugin is enabled, otherwise false */ @@ -28,7 +41,7 @@ index 7d4ca43b5..9ec042fd7 100644 if ((plugin != null) && (plugins.contains(plugin))) { return plugin.isEnabled(); } else { -@@ -400,7 +400,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -399,7 +399,7 @@ public final class SimplePluginManager implements PluginManager { } } @@ -37,7 +50,7 @@ index 7d4ca43b5..9ec042fd7 100644 if (!plugin.isEnabled()) { List pluginCommands = PluginCommandYamlParser.parse(plugin); -@@ -437,7 +437,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -436,7 +436,7 @@ public final class SimplePluginManager implements PluginManager { disablePlugin(plugin, false); } @@ -46,7 +59,7 @@ index 7d4ca43b5..9ec042fd7 100644 // Paper end - close Classloader on disable if (plugin.isEnabled()) { try { -@@ -497,6 +497,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -496,6 +496,7 @@ public final class SimplePluginManager implements PluginManager { defaultPerms.get(false).clear(); } } @@ -54,7 +67,7 @@ index 7d4ca43b5..9ec042fd7 100644 /** * Calls an event with the given details. -@@ -506,22 +507,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -505,25 +506,11 @@ public final class SimplePluginManager implements PluginManager { * @param event Event details */ public void callEvent(@NotNull Event event) { @@ -67,22 +80,27 @@ index 7d4ca43b5..9ec042fd7 100644 - } - fireEvent(event); - } else { +- if (!server.isPrimaryThread()) { +- throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from another thread."); +- } - synchronized (this) { - fireEvent(event); - } -- } -- } -- -- private void fireEvent(@NotNull Event event) { + // Paper - replace callEvent by merging to below method ++ if (event.isAsynchronous() && server.isPrimaryThread()) { ++ throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from primary server thread."); + } +- } + +- private void fireEvent(@NotNull Event event) { HandlerList handlers = event.getHandlers(); RegisteredListener[] listeners = handlers.getRegisteredListeners(); diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java -index 6b86128e1..56308c0c6 100644 +index 5e986de8..2b50fe63 100644 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java -@@ -19,7 +19,7 @@ public class PluginManagerTest { +@@ -17,7 +17,7 @@ public class PluginManagerTest { private static final PluginManager pm = TestServer.getInstance().getPluginManager(); private final MutableObject store = new MutableObject(); @@ -91,7 +109,7 @@ index 6b86128e1..56308c0c6 100644 @Test public void testAsyncSameThread() { final Event event = new TestEvent(true); -@@ -30,14 +30,14 @@ public class PluginManagerTest { +@@ -28,14 +28,14 @@ public class PluginManagerTest { return; } throw new IllegalStateException("No exception thrown"); @@ -108,15 +126,15 @@ index 6b86128e1..56308c0c6 100644 @Test public void testAsyncLocked() throws InterruptedException { final Event event = new TestEvent(true); -@@ -58,7 +58,7 @@ public class PluginManagerTest { - secondThread.join(); - assertThat(store.value, is(instanceOf(IllegalStateException.class))); - assertThat(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.", is(((Throwable) store.value).getMessage())); +@@ -123,7 +123,7 @@ public class PluginManagerTest { + if (store.value == null) { + throw new IllegalStateException("No exception thrown"); + } - } -+ }*/ // Paper end ++ } */ // Paper @Test - public void testAsyncUnlocked() throws InterruptedException { + public void testRemovePermissionByNameLower() { -- 2.21.0 diff --git a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch index e5514ec830..32e6c47ea6 100644 --- a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From b1f618ac17c88f9368f8946b906791dc9d62d62d Mon Sep 17 00:00:00 2001 +From b3c143f917ab08b168af452ef3687e79be91b829 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:20 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -index cdf2e2016..5e93f1bbb 100644 +index cdf2e201..5e93f1bb 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -30,7 +30,7 @@ index cdf2e2016..5e93f1bbb 100644 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -index d0ccba060..280ca87bb 100644 +index d0ccba06..280ca87b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -83,7 +83,7 @@ index d0ccba060..280ca87bb 100644 return cancelled; } diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -index cc1b03eb2..15be7128b 100644 +index cc1b03eb..15be7128 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; diff --git a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch index 76f28a9516..210576f55b 100644 --- a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 45165a47c5ca5524f6990174947c219226c1aa90 Mon Sep 17 00:00:00 2001 +From ef0003fe68b304fe055657557cc65576371ec7ef Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java new file mode 100644 -index 000000000..73dabb82c +index 00000000..73dabb82 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java @@ -0,0 +1,114 @@ diff --git a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch index 74da9686a7..481f06f644 100644 --- a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From 447eebd1b98c8302e223ba21f6a5390fc1ac4491 Mon Sep 17 00:00:00 2001 +From dc43b4d369f3dd1705303fd1f9e3db0e0f78e8a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 661ebd1fa..893300a77 100644 +index e583f86d..7302b6e3 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -24,6 +24,32 @@ public interface Chunk { @@ -44,10 +44,10 @@ index 661ebd1fa..893300a77 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 5ccd8500d..c5da4d387 100644 +index 8d23ad74..7e245356 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -149,6 +149,22 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -156,6 +156,22 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Chunk getChunkAt(@NotNull Block block); diff --git a/Spigot-API-Patches/0134-Async-Chunks-API.patch b/Spigot-API-Patches/0134-Async-Chunks-API.patch index a9a4784cd9..9a8d654c5f 100644 --- a/Spigot-API-Patches/0134-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0134-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From 3f7142e984cbde2cfa7e547152ddad58da19d150 Mon Sep 17 00:00:00 2001 +From 87e727b0b52b60f2d73ecb218f54e6a170453355 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index c5da4d387..1b0744ed9 100644 +index 7e245356..99527eb5 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -163,6 +163,358 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -170,6 +170,358 @@ public interface World extends PluginMessageRecipient, Metadatable { public default Chunk getChunkAt(long chunkKey) { return getChunkAt((int) chunkKey, (int) (chunkKey >> 32)); } @@ -371,10 +371,10 @@ index c5da4d387..1b0744ed9 100644 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 81d92145e..373ee2235 100644 +index 5098eade..b0ba2d97 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -158,6 +158,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable { +@@ -156,6 +156,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable { */ public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause); diff --git a/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch index 427764387b..51b9bf9fe1 100644 --- a/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch @@ -1,11 +1,11 @@ -From 0b4c65cdc26ae34774ce159206165ec61a519cff Mon Sep 17 00:00:00 2001 +From a01c59bfa5adbd1f5587c65ea8a8cd02a9055e03 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index fa13b38d3..e800259a2 100644 +index fa13b38d..e800259a 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 401f6976d2..2e0303dca6 100644 --- a/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From 4f5dd88993320659d89a19cf35369636b0e3debe Mon Sep 17 00:00:00 2001 +From bc07cddc9c670f92b31bbfecca2042f85e2ca753 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:04:58 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 893300a77..22ff63e52 100644 +index 893300a7..22ff63e5 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -99,13 +99,26 @@ public interface Chunk { diff --git a/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch index 6615755438..a4272b7efe 100644 --- a/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -1,11 +1,11 @@ -From 85faf4182bc480db78d548ee3fc732cfa3262cdb Mon Sep 17 00:00:00 2001 +From 812ce8fc0b825ddf9b7ec78cbf6982a799cf26bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:19:37 -0400 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index 043695239..99815866b 100644 +index 04369523..99815866 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -119,7 +119,7 @@ public class TimingHistory { diff --git a/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 914182a796..b29fd79486 100644 --- a/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -1,4 +1,4 @@ -From 821698c0c68f13b975a259c2e85d63963e948d8e Mon Sep 17 00:00:00 2001 +From 3b4d905bfd218550bf8a4c4aecb694af0b2ecd87 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -18,10 +18,10 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 4c2a269d..2719eecb 100644 +index 8e444f7f..e546407e 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -13,7 +13,6 @@ import org.jetbrains.annotations.Nullable; +@@ -12,7 +12,6 @@ import org.jetbrains.annotations.Nullable; // Paper start import java.util.Collection; @@ -29,7 +29,7 @@ index 4c2a269d..2719eecb 100644 import java.util.function.Predicate; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; -@@ -578,6 +577,17 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -577,6 +576,17 @@ public class Location implements Cloneable, ConfigurationSerializable { blockLoc.setZ(getBlockZ()); return blockLoc; } @@ -48,10 +48,10 @@ index 4c2a269d..2719eecb 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 1b0744ed..fa736b07 100644 +index 99527eb5..446d91c5 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -80,6 +80,38 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -87,6 +87,38 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Block getBlockAt(@NotNull Location location); @@ -91,10 +91,10 @@ index 1b0744ed..fa736b07 100644 * Gets the y coordinate of the lowest block at this position such that the * block and all blocks above it are transparent for lighting purposes. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 708288e9..7c1dd5f6 100644 +index af4ffada..87185a81 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java -@@ -153,6 +153,72 @@ public interface Block extends Metadatable { +@@ -152,6 +152,72 @@ public interface Block extends Metadatable { */ int getZ(); diff --git a/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch index 348db54aac..0ed0858ca8 100644 --- a/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From d9ac230cc79f6ee8b01f988d6bbe07edf16b31db Mon Sep 17 00:00:00 2001 +From 855e6ce1a9904a0cc12cacec59f86be7a77bec65 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java new file mode 100644 -index 000000000..2638bbd3e +index 00000000..2638bbd3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java @@ -0,0 +1,38 @@ @@ -50,7 +50,7 @@ index 000000000..2638bbd3e +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java new file mode 100644 -index 000000000..14b67da10 +index 00000000..14b67da1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java @@ -0,0 +1,53 @@ @@ -109,7 +109,7 @@ index 000000000..14b67da10 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java new file mode 100644 -index 000000000..c8dd49d11 +index 00000000..c8dd49d1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java @@ -0,0 +1,17 @@ @@ -132,7 +132,7 @@ index 000000000..c8dd49d11 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java new file mode 100644 -index 000000000..e9ba32799 +index 00000000..e9ba3279 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java @@ -0,0 +1,31 @@ @@ -169,7 +169,7 @@ index 000000000..e9ba32799 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java new file mode 100644 -index 000000000..4683a7237 +index 00000000..4683a723 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java @@ -0,0 +1,17 @@ @@ -191,7 +191,7 @@ index 000000000..4683a7237 + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e2..c4791f95d 100644 +index 1119e26e..c4791f95 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java @@ -14,4 +14,20 @@ public interface Slime extends Mob { diff --git a/Spigot-API-Patches/0140-isChunkGenerated-API.patch b/Spigot-API-Patches/0140-isChunkGenerated-API.patch index 5ecdc91d9f..a6862b14c4 100644 --- a/Spigot-API-Patches/0140-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0140-isChunkGenerated-API.patch @@ -1,11 +1,11 @@ -From 39f88f102e19e146cd9a008dfc0af879190f3f3a Mon Sep 17 00:00:00 2001 +From 1ed95fc07f6d3e686f998625d821320a3419b70d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:39:46 -0700 Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 2719eecb..a90f78d5 100644 +index e546407e..7713f183 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -1,5 +1,6 @@ @@ -14,8 +14,8 @@ index 2719eecb..a90f78d5 100644 +import com.google.common.base.Preconditions; // Paper import java.util.HashMap; import java.util.Map; - -@@ -518,6 +519,15 @@ public class Location implements Cloneable, ConfigurationSerializable { + import org.bukkit.block.Block; +@@ -517,6 +518,15 @@ public class Location implements Cloneable, ConfigurationSerializable { public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper // Paper start @@ -32,10 +32,10 @@ index 2719eecb..a90f78d5 100644 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index fa736b07..38dae649 100644 +index 446d91c5..dd51aa31 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -196,6 +196,17 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -203,6 +203,17 @@ public interface World extends PluginMessageRecipient, Metadatable { return getChunkAt((int) chunkKey, (int) (chunkKey >> 32)); } diff --git a/Spigot-API-Patches/0141-Add-More-Creeper-API.patch b/Spigot-API-Patches/0141-Add-More-Creeper-API.patch index fb46210b99..8ad3976b7c 100644 --- a/Spigot-API-Patches/0141-Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/0141-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From f16fe791645fb69068ef0d3cf540a6106aa47e1e Mon Sep 17 00:00:00 2001 +From 7b741981e2d04a10c5cc9c8c883aa235481c1a10 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java new file mode 100644 -index 000000000..ff10251b6 +index 00000000..ff10251b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 000000000..ff10251b6 + } +} diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java -index f957d8368..b9877fb88 100644 +index f957d836..b9877fb8 100644 --- a/src/main/java/org/bukkit/entity/Creeper.java +++ b/src/main/java/org/bukkit/entity/Creeper.java @@ -50,4 +50,32 @@ public interface Creeper extends Monster { diff --git a/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch index 3b7ac71093..2811dc29d8 100644 --- a/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From c2f4f4916892115c29f047a6f294c0103d83cdaa Mon Sep 17 00:00:00 2001 +From 96d56296712254c823bd6ed82e626232ecc1948e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java new file mode 100644 -index 000000000..9022f697a +index 00000000..9022f697 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java @@ -0,0 +1,31 @@ @@ -42,7 +42,7 @@ index 000000000..9022f697a + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044edc..ed4d417c2 100644 +index 1a1044ed..ed4d417c 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -1,5 +1,8 @@ diff --git a/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch index 173f856fd8..c03390e251 100644 --- a/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From c273ba5e5fbb6580371f21b58d31659fa105de33 Mon Sep 17 00:00:00 2001 +From a577299608e2fedf76e94d9ae75675133a0cd032 Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:25 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index 75d4e70f5..a28731dc2 100644 +index 75d4e70f..a28731dc 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { diff --git a/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch index 145abfc676..7f2a58b5af 100644 --- a/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch @@ -1,14 +1,14 @@ -From e50186ec5e456237ac93fed193aeb097f3960ab8 Mon Sep 17 00:00:00 2001 +From 2393a64341d781d5e6101361c029c4866479e66c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 36e352917..a358e9014 100644 +index 5a38d8f1..01fe217d 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java -@@ -138,6 +138,34 @@ public interface Inventory extends Iterable { +@@ -125,6 +125,34 @@ public interface Inventory extends Iterable { @NotNull public HashMap removeItem(@NotNull ItemStack... items) throws IllegalArgumentException; diff --git a/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch index 6e45fe96a0..17493ad62a 100644 --- a/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 7f59337d09a8d3aa24f52603aa0b5d05cfb4dd6a Mon Sep 17 00:00:00 2001 +From be370e286edf69f7b99b9822bf91d53303dbda39 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:13:53 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java new file mode 100644 -index 000000000..18a96dbb0 +index 00000000..18a96dbb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java @@ -0,0 +1,54 @@ @@ -65,10 +65,10 @@ index 000000000..18a96dbb0 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 863d727d0..4dec50caf 100644 +index 95567daa..75761f2d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -80,6 +80,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @NotNull public Block getTargetBlock(@Nullable Set transparent, int maxDistance); diff --git a/Spigot-API-Patches/0146-Improve-death-events.patch b/Spigot-API-Patches/0146-Improve-death-events.patch index a66e29f462..4cd0a3c23f 100644 --- a/Spigot-API-Patches/0146-Improve-death-events.patch +++ b/Spigot-API-Patches/0146-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 0930e5799eef85630a49e526a2bf1942571a96ea Mon Sep 17 00:00:00 2001 +From 77c90772efb67a42bebfb667c8f04e61354b5762 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java -index a5984ab06..e19a3df9a 100644 +index a5984ab0..e19a3df9 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -5,14 +5,24 @@ import org.bukkit.entity.LivingEntity; diff --git a/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch index 7c980bef21..c5b73801c8 100644 --- a/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From b1cb593f47c8e02a87189db2ac57ca0eb2886a1a Mon Sep 17 00:00:00 2001 +From 9c3067c801a8c770b06fb8207a01e2378b3cc6cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 000000000..8b90a9053 +index 00000000..8b90a905 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +1,170 @@ @@ -188,7 +188,7 @@ index 000000000..8b90a9053 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 838440ff8..afdc103fe 100644 +index 838440ff..afdc103f 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -1,6 +1,7 @@ diff --git a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch index 476827db10..212754735b 100644 --- a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch @@ -1,4 +1,4 @@ -From 362462f10a7eddad6dd8e8e1066156dc1d155c5e Mon Sep 17 00:00:00 2001 +From cbd89dbe5d6252a902de32354206aae74b67febb Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:01:54 -0500 Subject: [PATCH] Expose attack cooldown methods for Player @@ -36,5 +36,5 @@ index a840b49d..1b3a6a91 100644 // Spigot start -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index f72a682bbe..24fc7d9fa0 100644 --- a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From df2942a347fb3b97c649f9340bda21f0c8d697b4 Mon Sep 17 00:00:00 2001 +From 311e3db15fe2f389a63eb03558ecfd021bfae7e4 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values @@ -226,36 +226,10 @@ index f5e3929a..8648e8fb 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index f2a6755a..3ed7ea06 100644 +index f6a7f97b..d040a740 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -@@ -86,14 +86,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { - *

- * Plugins should check if hasLore() returns true before - * calling this method. -- * -+ * - * @return a list of lore that is set - */ - @Nullable - List getLore(); - - /** -- * Sets the lore for this item. -+ * Sets the lore for this item. - * Removes lore when given null. - * - * @param lore the lore that will be set -@@ -124,7 +124,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { - int getEnchantLevel(@NotNull Enchantment ench); - - /** -- * Returns a copy the enchantments in this ItemMeta.
-+ * Returns a copy the enchantments in this ItemMeta.
- * Returns an empty map if none. - * - * @return An immutable copy of the enchantments -@@ -376,4 +376,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { +@@ -417,4 +417,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { @NotNull Spigot spigot(); // Spigot end @@ -343,5 +317,5 @@ index f2a6755a..3ed7ea06 100644 + // Paper end } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch index ddc047af56..d6ad113fda 100644 --- a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch +++ b/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch @@ -1,4 +1,4 @@ -From 9ef8200b5f3b3e797872a12054a45dc32f11b0d6 Mon Sep 17 00:00:00 2001 +From de095cece28d722865a1b8daf50cead1d26bb254 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 20:51:50 -0400 Subject: [PATCH] Performance & Concurrency Improvements to Permissions @@ -111,5 +111,5 @@ index 27c14c0f..72fff64e 100644 } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch index 7caad04119..d3daabd00a 100644 --- a/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch +++ b/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch @@ -1,4 +1,4 @@ -From 196d1c1b282ba815fc8b3112a52ad60f1eeafbcb Mon Sep 17 00:00:00 2001 +From 174bf2456490af968e86a1968c27b57932e52a4a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API @@ -65,5 +65,5 @@ index 00000000..43e6576b + } +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch index 0b6620848f..8e38edccf0 100644 --- a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 39f9822f65fbe38486e69b1d5a574688e19f66cd Mon Sep 17 00:00:00 2001 +From 1711a5a14d94328aabd0de48aa52f839741ba279 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,10 +6,10 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index db3d22fa..97b25dbd 100644 +index c5a8c96f..9063cf37 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java -@@ -62,6 +62,26 @@ public interface Furnace extends Container, Nameable { +@@ -61,6 +61,26 @@ public interface Furnace extends Container { */ public void setCookTimeTotal(int cookTimeTotal); @@ -37,5 +37,5 @@ index db3d22fa..97b25dbd 100644 @Override public FurnaceInventory getInventory(); -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch index 0ae16f423a..8c875f4c36 100644 --- a/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 930e3600cd6fdda939c4c6a0906af9d294b20f0f Mon Sep 17 00:00:00 2001 +From 067011b9b765658c52b5ceaf8e37a042119d2991 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -44,5 +44,5 @@ index 00000000..48cff063 + } +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch index b8853c6144..6a2fe95276 100644 --- a/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch +++ b/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch @@ -1,4 +1,4 @@ -From 01ac7113f549a412bd05f296f27d8f5ccb0264df Mon Sep 17 00:00:00 2001 +From a266af8e96aff5e4c85cb8804f27cd44ebae0262 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 22 Sep 2018 18:41:01 -0400 Subject: [PATCH] Remove Precondition on name for AttributeModifier @@ -23,5 +23,5 @@ index a9763147..f0dff145 100644 this.operation = operation; this.slot = slot; -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0155-Material-API-additions.patch b/Spigot-API-Patches/0155-Material-API-additions.patch index c955b1752d..4c2e715a33 100644 --- a/Spigot-API-Patches/0155-Material-API-additions.patch +++ b/Spigot-API-Patches/0155-Material-API-additions.patch @@ -1,14 +1,14 @@ -From fece5a49e0c86a1c0cb750f7aacdae6c919b319d Mon Sep 17 00:00:00 2001 +From d87976c339606180aab0ee21966a692f21fe6c63 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 6120955b..c628a934 100644 +index bb694bfb..a982092d 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -74,6 +74,7 @@ import org.jetbrains.annotations.Nullable; +@@ -80,6 +80,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index 6120955b..c628a934 100644 public enum Material implements Keyed { // ACACIA_BOAT(27326, 1), -@@ -2986,6 +2987,22 @@ public enum Material implements Keyed { +@@ -3291,6 +3292,22 @@ public enum Material implements Keyed { } } @@ -40,5 +40,5 @@ index 6120955b..c628a934 100644 * Do not use for any reason. * -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0156-Add-Material-Tags.patch b/Spigot-API-Patches/0156-Add-Material-Tags.patch index 4a1d5f4bd8..8d690c5f38 100644 --- a/Spigot-API-Patches/0156-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0156-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From 09e55e7e559803535279eafbb816285bd1b2f8dd Mon Sep 17 00:00:00 2001 +From 979f60cf2cbf5cd62d30024b971762dab77f6be7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 Subject: [PATCH] Add Material Tags @@ -204,10 +204,10 @@ index 00000000..c91ea2a0 +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 00000000..660191c2 +index 00000000..ef1e2c19 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,382 @@ +@@ -0,0 +1,374 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -310,14 +310,6 @@ index 00000000..660191c2 + */ + public static final MaterialSetTag DYES = new MaterialSetTag(keyFor("dyes")) + .endsWith("_DYE") -+ .add(Material.BONE_MEAL, -+ Material.CACTUS_GREEN, -+ Material.COCOA_BEANS, -+ Material.DANDELION_YELLOW, -+ Material.INK_SAC, -+ Material.LAPIS_LAZULI, -+ Material.ROSE_RED -+ ) + .ensureSize("DYES", 16); + + /** @@ -391,7 +383,7 @@ index 00000000..660191c2 + */ + public static final MaterialSetTag HORSE_ARMORS = new MaterialSetTag(keyFor("horse_armors")) + .endsWith("_HORSE_ARMOR") -+ .ensureSize("HORSE_ARMORS", 3); ++ .ensureSize("HORSE_ARMORS", 4); + + /** + * Covers the 6 variants of infested blocks. @@ -526,7 +518,7 @@ index 00000000..660191c2 + */ + public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs")) + .endsWith("_SPAWN_EGG") -+ .ensureSize("SPAWN_EGGS", 51); ++ .ensureSize("SPAWN_EGGS", 58); + + /** + * Covers all 16 colors of stained glass. @@ -574,8 +566,8 @@ index 00000000..660191c2 + .ensureSize("PURPUR", 4); + + public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs")) -+ .add(Material.SIGN, Material.WALL_SIGN) -+ .ensureSize("SIGNS", 2); ++ .endsWith("_SIGN") ++ .ensureSize("SIGNS", 12); + + public static final MaterialSetTag TORCH = new MaterialSetTag(keyFor("torch")) + .add(Material.TORCH, Material.WALL_TORCH) @@ -622,10 +614,10 @@ index 00000000..328c5147 + } +} diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java -index 2d840320..613675c3 100644 +index 596384b1..763befad 100644 --- a/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java -@@ -30,6 +30,16 @@ public class TestServer implements InvocationHandler { +@@ -28,6 +28,16 @@ public final class TestServer implements InvocationHandler { } } ); @@ -643,5 +635,5 @@ index 2d840320..613675c3 100644 Server.class.getMethod("getPluginManager"), new MethodHandler() { -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch index c42b730c13..6f3ddda761 100644 --- a/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch @@ -1,4 +1,4 @@ -From 51548bbf5aeeb8f3a3de2a0e3dced36cfad2d0f1 Mon Sep 17 00:00:00 2001 +From 313d42af8e15482fef26f3b7a600604215cdd5b7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:09 -0500 Subject: [PATCH] Allow setting the vex's summoner @@ -39,5 +39,5 @@ index 6b61c4ab..c34a3ea7 100644 + // Paper end } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch index 77349b847a..bce6412651 100644 --- a/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 0c9f9a99d36b102cc16c1ac0c7482020fd4100a8 Mon Sep 17 00:00:00 2001 +From e7febe25992426125545ed3cee761b525a8231c3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -49,10 +49,10 @@ index 00000000..f52644fa + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 4dec50ca..956d6886 100644 +index 75761f2d..7f3c0a6e 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -149,6 +149,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @Nullable public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode); @@ -104,5 +104,5 @@ index 4dec50ca..956d6886 100644 /** -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0159-Add-sun-related-API.patch b/Spigot-API-Patches/0159-Add-sun-related-API.patch index 172194fe0f..926127417c 100644 --- a/Spigot-API-Patches/0159-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0159-Add-sun-related-API.patch @@ -1,14 +1,14 @@ -From 7401b4dc7ba58b3d5d00428a19bc05f18a3e74c5 Mon Sep 17 00:00:00 2001 +From 6c29a689f44834265546b00ccd11758431e6e39a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 38dae649..107f4173 100644 +index dd51aa31..696cd649 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1517,6 +1517,16 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1495,6 +1495,16 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public void setFullTime(long time); diff --git a/Spigot-API-Patches/0160-Here-s-Johnny.patch b/Spigot-API-Patches/0160-Here-s-Johnny.patch index 90e51381bb..5f1c5392c2 100644 --- a/Spigot-API-Patches/0160-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0160-Here-s-Johnny.patch @@ -1,4 +1,4 @@ -From e21b9c46b962bc38d364e12be6f4cdea7a3f976a Mon Sep 17 00:00:00 2001 +From 0a5183f643ec62c7b54a00cd947bd76e8fff4549 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! @@ -41,5 +41,5 @@ index b8ea68a8..c5d9e76a 100644 + // Paper end +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0161-Turtle-API.patch b/Spigot-API-Patches/0161-Turtle-API.patch index 9ea9b82f14..62822edafc 100644 --- a/Spigot-API-Patches/0161-Turtle-API.patch +++ b/Spigot-API-Patches/0161-Turtle-API.patch @@ -1,4 +1,4 @@ -From 923bcf4b55c82138f234eed513f8879127b2bbe7 Mon Sep 17 00:00:00 2001 +From b0207fc37267ae453255af719476006e8c691228 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API @@ -282,5 +282,5 @@ index 0a4cd299..5375ea14 100644 + // Paper end +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch index a183b0cf84..204f56920d 100644 --- a/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From ae5ce884e6e5bee712aeffd645155caeb706448c Mon Sep 17 00:00:00 2001 +From 4a214392891daf7fd2226846aa79e07b9ab49367 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:13 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -57,5 +57,5 @@ index cb9e9f36..a15f70ff 100644 // Paper end } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0163-Add-spectator-target-events.patch b/Spigot-API-Patches/0163-Add-spectator-target-events.patch index 737fe425ef..7ea6ded0ba 100644 --- a/Spigot-API-Patches/0163-Add-spectator-target-events.patch +++ b/Spigot-API-Patches/0163-Add-spectator-target-events.patch @@ -1,4 +1,4 @@ -From fd64305843cdc2eb3b4190820f259edf3a08d9a9 Mon Sep 17 00:00:00 2001 +From 58eb9b3112c67d09fce2461a9ad9cf420d601472 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:30:56 -0500 Subject: [PATCH] Add spectator target events @@ -140,5 +140,5 @@ index 00000000..693d119a + } +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0164-Add-more-Witch-API.patch b/Spigot-API-Patches/0164-Add-more-Witch-API.patch index 7e075354ee..2088bae2fc 100644 --- a/Spigot-API-Patches/0164-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0164-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From 21d9b029cdd5e1dd73ff4ece26a7341d82fa58fd Mon Sep 17 00:00:00 2001 +From 4d56256f208eb7e341e808fa2e9c829e1a64cf61 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index 4b27f689..1828b2ce 100644 +index aa88aede..cd8d0a20 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -2,8 +2,43 @@ package org.bukkit.entity; @@ -20,9 +20,8 @@ index 4b27f689..1828b2ce 100644 /** * Represents a Witch */ --public interface Witch extends Monster, RangedEntity { // Paper -+// Paper start -+public interface Witch extends Monster, RangedEntity { + public interface Witch extends Raider, RangedEntity { // Paper ++ // Paper start + /** + * Check if Witch is drinking a potion + * @@ -54,5 +53,5 @@ index 4b27f689..1828b2ce 100644 + // Paper end } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch index 0305019508..a7e47e0886 100644 --- a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch +++ b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch @@ -1,14 +1,14 @@ -From 383fa5f406c81e4d9fe447e96ab1f31f484762c8 Mon Sep 17 00:00:00 2001 +From 6ec94f4f8695610e7c6384bae59a3571718ed391 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:44:54 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index fab360c0..3b3d2712 100644 +index db9d3f9a..3b883b93 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1587,6 +1587,15 @@ public final class Bukkit { +@@ -1570,6 +1570,15 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -25,10 +25,10 @@ index fab360c0..3b3d2712 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index ce2644fe..66e53c51 100644 +index d7ef680b..63a661bd 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1390,6 +1390,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1375,6 +1375,13 @@ public interface Server extends PluginMessageRecipient { */ boolean suggestPlayerNamesWhenNullTabCompletions(); @@ -43,10 +43,10 @@ index ce2644fe..66e53c51 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index c2c19ed4..f0222fc2 100644 +index 03bdc162..0b0d1bd7 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java -@@ -187,7 +187,7 @@ public abstract class Command { +@@ -185,7 +185,7 @@ public abstract class Command { } if (permissionMessage == null) { diff --git a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch index 4b097e6110..bcb8d56294 100644 --- a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch +++ b/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch @@ -1,4 +1,4 @@ -From 5a2e30487b3a170f81c18af60314b49c0767fdfe Mon Sep 17 00:00:00 2001 +From 11f2703bdec691d543ce1d7fb34e7b3ecf950a5f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 15:53:43 +0000 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit @@ -108,5 +108,5 @@ index a473b2c6..a5b4aed5 100644 @Override public HandlerList getHandlers() -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0167-Add-more-Zombie-API.patch b/Spigot-API-Patches/0167-Add-more-Zombie-API.patch index 84bbda9e62..d0d7c220e5 100644 --- a/Spigot-API-Patches/0167-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0167-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From 088a4d4d3a4b77cb4b258bb325ea4bb92cb5b2fc Mon Sep 17 00:00:00 2001 +From 7ad724db569c57628ef6ad4199f26140032c3159 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API @@ -65,5 +65,5 @@ index ee2e70c6..74d6529a 100644 + // Paper end } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch index 392c456de0..61b4e53a23 100644 --- a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch +++ b/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch @@ -1,4 +1,4 @@ -From 7b9013c66aee00fbbc3eb414de015d6907fb0b16 Mon Sep 17 00:00:00 2001 +From 60f914151d133a85f5ed0a0e506540d494c515f7 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible @@ -33,5 +33,5 @@ index c15fa003..31ff2f61 100644 } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch index 2e56d10433..178d75c19e 100644 --- a/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 8eb7bcda4f5274584f66d7e5d9d972898a553f6d Mon Sep 17 00:00:00 2001 +From 97a5ad5bffb496b0895e50927fc43cb4a9909b8f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -135,5 +135,5 @@ index 00000000..12c1c6fe + } +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index e3739e7005..90807aa194 100644 --- a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From 615b781d9c54ecfcfc43ae7096c0af3307f93119 Mon Sep 17 00:00:00 2001 +From 0c244d3a0ef40f461a59e81f0c420991fa9368d5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:31:12 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 919d1b66..30195c04 100644 +index aed01189..f6782e0d 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java -@@ -145,7 +145,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio +@@ -144,7 +144,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio * UTC. * * @return Date of last log-in for this player, or 0 @@ -29,7 +29,7 @@ index 919d1b66..30195c04 100644 public long getLastPlayed(); /** -@@ -164,4 +166,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio +@@ -163,4 +165,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @Nullable public Location getBedSpawnLocation(); @@ -61,5 +61,5 @@ index 919d1b66..30195c04 100644 + } -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0171-BlockDestroyEvent.patch b/Spigot-API-Patches/0171-BlockDestroyEvent.patch index 25fbac35db..f337ef5c8e 100644 --- a/Spigot-API-Patches/0171-BlockDestroyEvent.patch +++ b/Spigot-API-Patches/0171-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 67d13b14545794f1f093315c2be8d819c05e278d Mon Sep 17 00:00:00 2001 +From e159ad95e45ec024a8a765adc94c3eee46e06467 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:19:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -109,5 +109,5 @@ index 00000000..3aee12f1 + } +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch index f249c813ef..819b1b850b 100644 --- a/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch +++ b/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch @@ -1,4 +1,4 @@ -From 632bf8d0264ffc11ab61cfab018bb04113d044a2 Mon Sep 17 00:00:00 2001 +From d553fac2c7725eb035224170171d9d134f64e90b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Jan 2014 19:13:57 -0500 Subject: [PATCH] Add ItemStack Recipe API helper methods @@ -6,10 +6,10 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods Allows using ExactChoice Recipes with easier methodss diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index 64a43f42..76b2dd7c 100644 +index 038ed0a6..2181f09b 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -@@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed { +@@ -143,6 +143,13 @@ public class ShapedRecipe implements Recipe, Keyed { return this; } @@ -24,10 +24,10 @@ index 64a43f42..76b2dd7c 100644 * Get a copy of the ingredients map. * diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 46a398e8..818bf293 100644 +index 823645c5..062924ea 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -@@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -141,6 +141,40 @@ public class ShapelessRecipe implements Recipe, Keyed { return this; } @@ -69,5 +69,5 @@ index 46a398e8..818bf293 100644 * Removes an ingredient from the list. * -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch index d2dc62fbd9..880c038fb8 100644 --- a/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch +++ b/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch @@ -1,4 +1,4 @@ -From 395fff0b77224ccc1cc19be8c5b3142dbb1d8c2a Mon Sep 17 00:00:00 2001 +From 80bd01a329efd26892f15e07c3502a4bf66e14e6 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:04:43 +0200 Subject: [PATCH] Add WhitelistToggleEvent @@ -51,5 +51,5 @@ index 00000000..fdd5eedb + } +} -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0174-Annotation-Test-changes.patch b/Spigot-API-Patches/0174-Annotation-Test-changes.patch index 60bcb1e2e5..5b680a444b 100644 --- a/Spigot-API-Patches/0174-Annotation-Test-changes.patch +++ b/Spigot-API-Patches/0174-Annotation-Test-changes.patch @@ -1,4 +1,4 @@ -From 7269a08679d0faf34b9dd95a1d34869a6c2ba1e7 Mon Sep 17 00:00:00 2001 +From b336313faa48d320445d797f0057e88e42bb366e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 17 Mar 2019 23:04:30 +0000 Subject: [PATCH] Annotation Test changes @@ -28,5 +28,5 @@ index dfd6e137..596f2807 100644 @Test -- -2.17.1 +2.21.0 diff --git a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch index 8006111c19..4c77eba81d 100644 --- a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From be2fc371c8aab2bf2560c8d9d79b76d97d8bb818 Mon Sep 17 00:00:00 2001 +From b663560421b798309ed99e5cc5f981cfa76e02e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:21:23 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 373ee2235..148c7b1fd 100644 +index b0ba2d97..61aa4999 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -645,5 +645,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable { +@@ -643,5 +643,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable { */ @NotNull Chunk getChunk(); diff --git a/Spigot-API-Patches/0176-Add-GS4-Query-event.patch b/Spigot-API-Patches/0176-Add-GS4-Query-event.patch index 2a4d5975f0..68baedb28b 100644 --- a/Spigot-API-Patches/0176-Add-GS4-Query-event.patch +++ b/Spigot-API-Patches/0176-Add-GS4-Query-event.patch @@ -1,4 +1,4 @@ -From 784e07fa6c5fa8c82d5da5f08f79563f467231ca Mon Sep 17 00:00:00 2001 +From b3a8a2440a3796371a4450a4e5b464f1f473674e Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:27 +0200 Subject: [PATCH] Add GS4 Query event @@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java new file mode 100644 -index 000000000..2ead0466e +index 00000000..2ead0466 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java @@ -0,0 +1,411 @@ diff --git a/Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch index 81bd5f170f..90553c1b5a 100644 --- a/Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch +++ b/Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From 80656b237d73ba1ee0563565476fa0dbd4c84afa Mon Sep 17 00:00:00 2001 +From c8a1fe8d001b65dc3a8c65b81e22e89955cc35bc Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:33:13 -0700 Subject: [PATCH] Add PlayerPostRespawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java new file mode 100644 -index 000000000..31f34b548 +index 00000000..31f34b54 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java @@ -0,0 +1,52 @@ diff --git a/Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch index bbc83c45fb..3023f77869 100644 --- a/Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch +++ b/Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch @@ -1,4 +1,4 @@ -From 37fda0cd6fa5841548e4747e642c0e67800829e8 Mon Sep 17 00:00:00 2001 +From 67b6e8b2a250f63b27cc203cd31f6e09e12d265a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:44:26 -0400 Subject: [PATCH] Ignore package-private methods for nullability annotations @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations This isn't API diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 596f28076..cdc0afc0c 100644 +index 596f2807..cdc0afc0 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -163,7 +163,7 @@ public class AnnotationTest { diff --git a/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch index e0cef6db18..1b9fe7d190 100644 --- a/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch +++ b/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch @@ -1,4 +1,4 @@ -From 33fb1bc679558ecf173b799fc670e6660e6dc32a Mon Sep 17 00:00:00 2001 +From edb2d6dfb38c6b17a6d159252e6bce00a1a92f8b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:39:01 -0400 Subject: [PATCH] Flip some Spigot API null annotations @@ -9,10 +9,10 @@ a ton of noise to plugin developers. These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6b0a0906..5ed9726c 100644 +index 3b883b93..9f56e7f8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1183,7 +1183,7 @@ public final class Bukkit { +@@ -1166,7 +1166,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -21,7 +21,7 @@ index 6b0a0906..5ed9726c 100644 public static ScoreboardManager getScoreboardManager() { return server.getScoreboardManager(); } -@@ -1480,7 +1480,7 @@ public final class Bukkit { +@@ -1463,7 +1463,7 @@ public final class Bukkit { * @param clazz the class of the tag entries * @return the tag or null */ @@ -31,10 +31,10 @@ index 6b0a0906..5ed9726c 100644 return server.getTag(registry, tag, clazz); } diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index a90f78d5..8352b77c 100644 +index 7713f183..c12d2a26 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -44,7 +44,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -43,7 +43,7 @@ public class Location implements Cloneable, ConfigurationSerializable { * @param y The y-coordinate of this new location * @param z The z-coordinate of this new location */ @@ -43,7 +43,7 @@ index a90f78d5..8352b77c 100644 this(world, x, y, z, 0, 0); } -@@ -58,7 +58,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -57,7 +57,7 @@ public class Location implements Cloneable, ConfigurationSerializable { * @param yaw The absolute rotation on the x-plane, in degrees * @param pitch The absolute rotation on the y-plane, in degrees */ @@ -52,7 +52,7 @@ index a90f78d5..8352b77c 100644 this.world = world; this.x = x; this.y = y; -@@ -81,7 +81,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -80,7 +80,7 @@ public class Location implements Cloneable, ConfigurationSerializable { * * @return World that contains this location */ @@ -62,10 +62,10 @@ index a90f78d5..8352b77c 100644 return world; } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 66d22ba7..eb23417b 100644 +index 63a661bd..2f2be03f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -988,7 +988,7 @@ public interface Server extends PluginMessageRecipient { +@@ -973,7 +973,7 @@ public interface Server extends PluginMessageRecipient { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -74,7 +74,7 @@ index 66d22ba7..eb23417b 100644 ScoreboardManager getScoreboardManager(); /** -@@ -1258,7 +1258,7 @@ public interface Server extends PluginMessageRecipient { +@@ -1243,7 +1243,7 @@ public interface Server extends PluginMessageRecipient { * @param clazz the class of the tag entries * @return the tag or null */ @@ -105,10 +105,10 @@ index dca77bba..56734f8e 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 1b19f821..1d3b0a31 100644 +index 76da06d1..4f72cd7c 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java -@@ -9,6 +9,7 @@ import java.util.Set; +@@ -8,6 +8,7 @@ import java.util.Set; // Paper import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/Spigot-API-Patches/0180-Server-Tick-Events.patch b/Spigot-API-Patches/0180-Server-Tick-Events.patch index e10fe7dfc7..194c8a4654 100644 --- a/Spigot-API-Patches/0180-Server-Tick-Events.patch +++ b/Spigot-API-Patches/0180-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From f32b76ea1ec40f3380f2e0bf20b294c3358f4092 Mon Sep 17 00:00:00 2001 +From ffa7e3f5b074f2785650cbfb172f80444d6a0548 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 21:58:55 -0400 Subject: [PATCH] Server Tick Events @@ -7,7 +7,7 @@ Fires event at start and end of a server tick diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java new file mode 100644 -index 000000000..9fd28e036 +index 00000000..9fd28e03 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java @@ -0,0 +1,59 @@ @@ -72,7 +72,7 @@ index 000000000..9fd28e036 +} diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java new file mode 100644 -index 000000000..eac85f1f4 +index 00000000..eac85f1f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java @@ -0,0 +1,32 @@ diff --git a/Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch index 0764c7542f..3d82530256 100644 --- a/Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 07838b78d9fd7f850bd8deec2d90a88f1b3d20a6 Mon Sep 17 00:00:00 2001 +From c44389f13850fc2f9f8e5bef6ba3877cd44f5326 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 11 Mar 2013 20:04:34 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,10 +8,10 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 5b0ef1eb..16f01550 100644 +index f0dda632..f5c3c5e2 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -@@ -18,6 +18,40 @@ public class PlayerDeathEvent extends EntityDeathEvent { +@@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent { private boolean keepLevel = false; private boolean keepInventory = false; diff --git a/Spigot-API-Patches/0182-Add-Heightmap-API.patch b/Spigot-API-Patches/0182-Add-Heightmap-API.patch index afab0ff3b6..44d78c0da9 100644 --- a/Spigot-API-Patches/0182-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0182-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From e5544cfd3617bee968c66c49cf81e059cbea7c97 Mon Sep 17 00:00:00 2001 +From 053132875985ae1a3b5b2b0ca97e76aec417ba59 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Dec 2018 19:00:36 -0800 Subject: [PATCH] Add Heightmap API @@ -46,10 +46,10 @@ index 00000000..4cd9b5ed + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 8352b77c..f1263600 100644 +index c12d2a26..1eef404e 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -610,6 +610,33 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -609,6 +609,33 @@ public class Location implements Cloneable, ConfigurationSerializable { return centerLoc; } @@ -84,10 +84,10 @@ index 8352b77c..f1263600 100644 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 107f4173..775aca85 100644 +index 696cd649..5469ee4f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -153,6 +153,79 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -160,6 +160,79 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Block getHighestBlockAt(@NotNull Location location); diff --git a/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch index bb2c5a9743..db4f28062a 100644 --- a/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch @@ -1,4 +1,4 @@ -From 73ceb55852feb2fc177ed6e70cb0b2846033b89f Mon Sep 17 00:00:00 2001 +From c12775547e70620e86c3d13910ed31fc1edfecff Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:19 -0500 Subject: [PATCH] Mob Spawner API Enhancements @@ -28,5 +28,5 @@ index 5773e99e..31c5a006 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index aed7f13ac6..f030572812 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From c65245a02ee7ec018df04e2545eba8212237ee1a Mon Sep 17 00:00:00 2001 +From 8b6209091a2f9f450324bb0ea704277985d61686 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 23ab857e0..51cefc0a1 100644 +index 3b89529f28..9d5a4ce991 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -16,7 +16,7 @@ index 23ab857e0..51cefc0a1 100644 - spigot + paper jar - 1.13.2-R0.1-SNAPSHOT + 1.14-pre5-SNAPSHOT - Spigot - http://www.spigotmc.org + Paper @@ -27,7 +27,7 @@ index 23ab857e0..51cefc0a1 100644 + UTF-8 unknown - 1.13.2 + 1.14-pre5 @@ -22,16 +21,16 @@ @@ -49,7 +49,7 @@ index 23ab857e0..51cefc0a1 100644 ${project.version} compile -@@ -102,34 +101,22 @@ +@@ -109,34 +108,22 @@ @@ -95,7 +95,7 @@ index 23ab857e0..51cefc0a1 100644 -@@ -139,11 +126,13 @@ +@@ -146,11 +133,13 @@ maven-jar-plugin 2.4 @@ -110,7 +110,7 @@ index 23ab857e0..51cefc0a1 100644 ${maven.build.timestamp} Bukkit ${api.version} -@@ -183,6 +172,7 @@ +@@ -190,6 +179,7 @@ shade @@ -118,7 +118,7 @@ index 23ab857e0..51cefc0a1 100644 ${shadeSourcesJar} -@@ -196,10 +186,11 @@ +@@ -203,10 +193,11 @@ jline org.bukkit.craftbukkit.libs.jline @@ -132,9 +132,9 @@ index 23ab857e0..51cefc0a1 100644 + + - org.bukkit.craftbukkit - org.bukkit.craftbukkit.v${minecraft_version} -@@ -225,10 +216,6 @@ + org.apache.commons.codec + org.bukkit.craftbukkit.libs.org.apache.commons.codec +@@ -248,10 +239,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.0 @@ -146,7 +146,7 @@ index 23ab857e0..51cefc0a1 100644 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 93046379d..674096cab 100644 +index 93046379d0..674096cab1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index c8173cea3d..edcc15c031 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From 77a8b142f999db9495bf8c4f8ae2b2e4f51eff3f Mon Sep 17 00:00:00 2001 +From a3b9b3e93ec4c99f6bdd845a923c4ee057801b78 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 000000000..2e79b0b5f +index 0000000000..2e79b0b5ff --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,241 @@ @@ -253,7 +253,7 @@ index 000000000..2e79b0b5f +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 000000000..db79fe41b +index 0000000000..db79fe41b9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,184 @@ @@ -443,7 +443,7 @@ index 000000000..db79fe41b +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 000000000..a73865739 +index 0000000000..a738657394 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,67 @@ @@ -515,32 +515,32 @@ index 000000000..a73865739 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 64a6a681f..ad9c00bc8 100644 +index e1ba833f3e..b60956218d 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - org.spigotmc.SpigotConfig.init((File) options.valueOf("spigot-settings")); - org.spigotmc.SpigotConfig.registerCommands(); - // Spigot end -+ // Paper start -+ try { -+ com.destroystokyo.paper.PaperConfig.init((File) options.valueOf("paper-settings")); -+ } catch (Exception e) { -+ DedicatedServer.LOGGER.error("Unable to load server configuration", e); -+ return false; -+ } -+ com.destroystokyo.paper.PaperConfig.registerCommands(); -+ // Paper end +@@ -152,6 +152,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + org.spigotmc.SpigotConfig.init((File) options.valueOf("spigot-settings")); + org.spigotmc.SpigotConfig.registerCommands(); + // Spigot end ++ // Paper start ++ try { ++ com.destroystokyo.paper.PaperConfig.init((File) options.valueOf("paper-settings")); ++ } catch (Exception e) { ++ DedicatedServer.LOGGER.error("Unable to load server configuration", e); ++ return false; ++ } ++ com.destroystokyo.paper.PaperConfig.registerCommands(); ++ // Paper end - DedicatedServer.LOGGER.info("Generating keypair"); - this.a(MinecraftEncryption.b()); + this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); + this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9a8bbeea7..cd998fcfb 100644 +index 43dc487eaa..cec990f357 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -133,9 +133,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { - private static final DataWatcherObject aG = DataWatcher.a(Entity.class, DataWatcherRegistry.i); - private static final DataWatcherObject aH = DataWatcher.a(Entity.class, DataWatcherRegistry.i); +@@ -132,9 +132,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { + private static final DataWatcherObject aC = DataWatcher.a(Entity.class, DataWatcherRegistry.i); + protected static final DataWatcherObject X = DataWatcher.a(Entity.class, DataWatcherRegistry.s); public boolean inChunk; - public int chunkX; - public int chunkY; @@ -548,67 +548,66 @@ index 9a8bbeea7..cd998fcfb 100644 + public int chunkX; public int getChunkX() { return chunkX; } // Paper - OBFHELPER + public int chunkY; public int getChunkY() { return chunkY; } // Paper - OBFHELPER + public int chunkZ; public int getChunkZ() { return chunkZ; } // Paper - OBFHELPER - public boolean ak; + public boolean af; public boolean impulse; public int portalCooldown; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index ee16fac91..b8abd6363 100644 +index e2a844c786..2ee4069173 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java -@@ -2,6 +2,8 @@ package net.minecraft.server; - - import com.mojang.datafixers.DataFixUtils; +@@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils; import com.mojang.datafixers.types.Type; -+ -+import java.util.Set; + import java.util.Collections; + import java.util.Optional; ++import java.util.Set; // Paper import java.util.UUID; import java.util.function.Function; import java.util.stream.Stream; -@@ -333,4 +335,10 @@ public class EntityTypes { - return new EntityTypes<>(this.a, this.b, this.c, this.d, type); +@@ -427,4 +428,10 @@ public class EntityTypes { + return new EntityTypes<>(this.a, this.b, this.c, this.d, this.e, type, this.f); } } + + // Paper start + public static Set getEntityNameList() { -+ return REGISTRY.keySet(); ++ return IRegistry.ENTITY_TYPE.keySet(); + } + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a84a182b2..9d5b3958b 100644 +index f31f407fa1..28fa346b7f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -130,6 +130,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc - private int tickPosition; +@@ -86,6 +86,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose + public boolean populating; public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot + public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper + public final SpigotTimings.WorldTimingsHandler timings; // Spigot - private boolean guardEntityList; // Spigot public static BlockPosition lastPhysicsProblem; // Spigot -@@ -151,6 +153,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc + private org.spigotmc.TickLimiter entityLimiter; +@@ -106,6 +108,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose - protected World(IDataManager idatamanager, @Nullable PersistentCollection persistentcollection, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) { + protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot + this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3b70a2857..6a44f0d91 100644 +index 142b4a3a17..60a5ba6c73 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -755,6 +755,7 @@ public final class CraftServer implements Server { +@@ -727,6 +727,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot + com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper for (WorldServer world : console.getWorlds()) { - world.worldData.setDifficulty(difficulty); - world.setSpawnFlags(monsters, animals); -@@ -770,6 +771,7 @@ public final class CraftServer implements Server { + world.worldData.setDifficulty(config.difficulty); + world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); +@@ -742,6 +743,7 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot @@ -616,7 +615,7 @@ index 3b70a2857..6a44f0d91 100644 } pluginManager.clearPlugins(); -@@ -777,6 +779,7 @@ public final class CraftServer implements Server { +@@ -749,6 +751,7 @@ public final class CraftServer implements Server { resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot @@ -624,7 +623,7 @@ index 3b70a2857..6a44f0d91 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2013,4 +2016,26 @@ public final class CraftServer implements Server { +@@ -1925,4 +1928,26 @@ public final class CraftServer implements Server { { return spigot; } @@ -652,7 +651,7 @@ index 3b70a2857..6a44f0d91 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 76abec66f..a62359ba6 100644 +index c9668afc65..3e7024780b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -128,6 +128,14 @@ public class Main { @@ -671,7 +670,7 @@ index 76abec66f..a62359ba6 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 2578c4957..d3c2abc39 100644 +index 20597d30c5..222adb40c1 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,31 +39,31 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index caf7218f55..2a7b24930b 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,87 +1,62 @@ -From 30a67e448eb304db37ace97ac0cc0f1347cd5bb6 Mon Sep 17 00:00:00 2001 +From ea2cb0f4f240fb9536382b71b44f412193744ebc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index bcb4b5e5c..c399bdecc 100644 +index 8f640f0c24..2831c03a69 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java -@@ -124,7 +124,7 @@ public abstract class BiomeBase { +@@ -42,7 +42,7 @@ public abstract class BiomeBase { @Nullable public static BiomeBase a(BiomeBase biomebase) { -- return (BiomeBase) BiomeBase.aH.fromId(IRegistry.BIOME.a((Object) biomebase)); -+ return (BiomeBase) BiomeBase.aH.fromId(IRegistry.BIOME.a(biomebase)); // Paper - decompile fix +- return (BiomeBase) BiomeBase.c.fromId(IRegistry.BIOME.a((Object) biomebase)); ++ return (BiomeBase) BiomeBase.c.fromId(IRegistry.BIOME.a(biomebase)); // Paper - decompile fix } - public static WorldGenCarverWrapper a(WorldGenCarver worldgencarver, C c0) { + public static WorldGenCarverWrapper a(WorldGenCarverAbstract worldgencarverabstract, C c0) { +@@ -202,7 +202,7 @@ public abstract class BiomeBase { + + @Nullable + public C b(StructureGenerator structuregenerator) { +- return (WorldGenFeatureConfiguration) this.t.get(structuregenerator); ++ return (C) this.t.get(structuregenerator); // Paper - decompile fix + } + + public List> e() { diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 16bca7942..13dc7abc5 100644 +index dc823e88a5..3745f66de5 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java -@@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger; +@@ -18,7 +18,7 @@ import org.apache.logging.log4j.Logger; @Immutable - public class BlockPosition extends BaseBlockPosition { + public class BlockPosition extends BaseBlockPosition implements MinecraftSerializable { - private static final Logger b = LogManager.getLogger(); + //private static final Logger b = LogManager.getLogger(); // Paper - variable name conflict, logger isn't used public static final BlockPosition ZERO = new BlockPosition(0, 0, 0); private static final int c = 1 + MathHelper.e(MathHelper.c(30000000)); private static final int d = BlockPosition.c; -@@ -147,7 +147,7 @@ public class BlockPosition extends BaseBlockPosition { - return a(Math.min(blockposition.getX(), blockposition1.getX()), Math.min(blockposition.getY(), blockposition1.getY()), Math.min(blockposition.getZ(), blockposition1.getZ()), Math.max(blockposition.getX(), blockposition1.getX()), Math.max(blockposition.getY(), blockposition1.getY()), Math.max(blockposition.getZ(), blockposition1.getZ())); - } - -- public static Iterable a(int i, int j, int k, int l, int i1, int j1) { -+ public static Iterable a(int ix, int jx, int kx, int l, int i1, int j1) { // Paper - decompile fix - return () -> { - return new AbstractIterator() { - private boolean g = true; -@@ -158,21 +158,21 @@ public class BlockPosition extends BaseBlockPosition { - protected BlockPosition computeNext() { - if (this.g) { - this.g = false; -- this.h = i; -- this.i = j; -- this.j = k; -- return new BlockPosition(i, j, k); -+ this.h = ix; // Paper - decompile fix -+ this.i = jx; // Paper - decompile fix -+ this.j = kx; // Paper - decompile fix -+ return new BlockPosition(ix, jx, kx); - } else if (this.h == l && this.i == i1 && this.j == j1) { - return (BlockPosition) this.endOfData(); - } else { - if (this.h < l) { - ++this.h; - } else if (this.i < i1) { -- this.h = i; -+ this.h = ix; // Paper - decompile fix - ++this.i; - } else if (this.j < j1) { -- this.h = i; -- this.i = j; -+ this.h = ix; // Paper - decompile fix -+ this.i = jx; // Paper - decompile fix - ++this.j; - } - -@@ -206,8 +206,11 @@ public class BlockPosition extends BaseBlockPosition { - if (this.g.b < l) { - ++this.g.b; - } else if (this.g.c < i1) { -+ this.g.b = i; // Paper - decompile fix Readd line removed by the decompiler - ++this.g.c; - } else if (this.g.d < j1) { -+ this.g.b = i; // Paper - decompile fix Readd line removed by the decompiler -+ this.g.c = j; // Paper - decompile fix Readd line removed by the decompiler - ++this.g.d; - } +@@ -57,12 +57,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali + OfInt ofint = dynamic.asIntStream().spliterator(); + int[] aint = new int[3]; +- if (ofint.tryAdvance((i) -> { ++ if (ofint.tryAdvance((Consumer) (i) -> { // Paper - decomile fix + aint[0] = i; +- }) && ofint.tryAdvance((i) -> { ++ }) && ofint.tryAdvance((Consumer) (i) -> { // Paper - decompile fix + aint[1] = i; + })) { +- ofint.tryAdvance((i) -> { ++ ofint.tryAdvance((Consumer) (i) -> { // Paper - decompile fix + aint[2] = i; + }); + } diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java -index 401b6d970..986b9ccea 100644 +index b4c8722f04..59d86fc66e 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -20,10 +20,10 @@ public class BlockStateEnum & INamable> extends BlockState @@ -97,57 +72,8 @@ index 401b6d970..986b9ccea 100644 String s1 = ((INamable) t0).getName(); if (this.b.containsKey(s1)) { -diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index 66b168396..83db94c4a 100644 ---- a/src/main/java/net/minecraft/server/DefinedStructure.java -+++ b/src/main/java/net/minecraft/server/DefinedStructure.java -@@ -85,7 +85,7 @@ public class DefinedStructure { - } - - private void a(World world, BlockPosition blockposition, BlockPosition blockposition1) { -- List list = world.a(Entity.class, new AxisAlignedBB(blockposition, blockposition1), (entity) -> { -+ List list = world.a(Entity.class, new AxisAlignedBB(blockposition, blockposition1), (java.util.function.Predicate) (entity) -> { // Paper - decompile fix - return !(entity instanceof EntityHuman); - }); - -@@ -235,7 +235,7 @@ public class DefinedStructure { - boolean flag = true; - EnumDirection[] aenumdirection = new EnumDirection[] { EnumDirection.UP, EnumDirection.NORTH, EnumDirection.EAST, EnumDirection.SOUTH, EnumDirection.WEST}; - -- int l1; -+ //int l1; // Paper - decompile fix - - while (flag && !list1.isEmpty()) { - flag = false; -@@ -245,7 +245,7 @@ public class DefinedStructure { - BlockPosition blockposition2 = (BlockPosition) iterator1.next(); - Fluid fluid1 = generatoraccess.getFluid(blockposition2); - -- for (l1 = 0; l1 < aenumdirection.length && !fluid1.d(); ++l1) { -+ for (int l1 = 0; l1 < aenumdirection.length && !fluid1.d(); ++l1) { // Paper - decompile fix - Fluid fluid2 = generatoraccess.getFluid(blockposition2.shift(aenumdirection[l1])); - - if (fluid2.getHeight() > fluid1.getHeight() || fluid2.d() && !fluid1.d()) { -@@ -270,7 +270,7 @@ public class DefinedStructure { - int i2 = j; - int j2 = k; - -- l1 = l; -+ int l1 = l; // Paper - decompile fix - Iterator iterator2 = list2.iterator(); - - Pair pair; -@@ -717,7 +717,7 @@ public class DefinedStructure { - public IBlockData a(int i) { - IBlockData iblockdata = (IBlockData) this.b.fromId(i); - -- return iblockdata == null ? DefinedStructure.a.a : iblockdata; -+ return iblockdata == null ? a : iblockdata; // Paper - decompile fix - } - - public Iterator iterator() { diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java -index d954b94c3..fd2a4f1b8 100644 +index d8d2267084..3de9d264db 100644 --- a/src/main/java/net/minecraft/server/GameRules.java +++ b/src/main/java/net/minecraft/server/GameRules.java @@ -17,7 +17,7 @@ import javax.annotation.Nullable; @@ -169,7 +95,7 @@ index d954b94c3..fd2a4f1b8 100644 this.e = bifunction; } diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java -index 1425584ed..b2757aad8 100644 +index cb0c08a144..9aabcb630f 100644 --- a/src/main/java/net/minecraft/server/NBTBase.java +++ b/src/main/java/net/minecraft/server/NBTBase.java @@ -88,7 +88,7 @@ public interface NBTBase { @@ -181,49 +107,8 @@ index 1425584ed..b2757aad8 100644 default String asString() { return this.toString(); -diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java -index 767013cae..e0fb6fb49 100644 ---- a/src/main/java/net/minecraft/server/NBTTagByteArray.java -+++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java -@@ -66,7 +66,8 @@ public class NBTTagByteArray extends NBTList { - return stringbuilder.append(']').toString(); - } - -- public NBTBase clone() { -+ @Override -+ public NBTTagByteArray clone() { // Paper - decompile fix - byte[] abyte = new byte[this.data.length]; - - System.arraycopy(this.data, 0, abyte, 0, this.data.length); -diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index 2b7b8be8a..27debcfca 100644 ---- a/src/main/java/net/minecraft/server/NBTTagList.java -+++ b/src/main/java/net/minecraft/server/NBTTagList.java -@@ -14,7 +14,7 @@ import org.apache.logging.log4j.Logger; - public class NBTTagList extends NBTList { - - private static final Logger f = LogManager.getLogger(); -- private List list = Lists.newArrayList(); -+ public List list = Lists.newArrayList(); // Paper - private byte type = 0; - - public NBTTagList() {} -diff --git a/src/main/java/net/minecraft/server/Registry.java b/src/main/java/net/minecraft/server/Registry.java -index 723372f26..9efec49d6 100644 ---- a/src/main/java/net/minecraft/server/Registry.java -+++ b/src/main/java/net/minecraft/server/Registry.java -@@ -1,3 +1,8 @@ - package net.minecraft.server; - --public interface Registry extends Iterable {} -+import java.util.Iterator; -+public interface Registry extends Iterable { // Paper - decompile fix -+ -+ @Override -+ Iterator iterator(); // Paper - decompile fix -+} diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java -index 50410264f..a894f7886 100644 +index 7f89562e90..4efcb8b595 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -27,7 +27,7 @@ public class RegistryBlockID implements Registry { @@ -236,7 +121,7 @@ index 50410264f..a894f7886 100644 this.c.set(i, t0); diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java -index 9400a4369..5a5c464ea 100644 +index 4cb78c6a3f..e15d286710 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -17,9 +17,9 @@ public class RegistryID implements Registry { @@ -251,7 +136,7 @@ index 9400a4369..5a5c464ea 100644 } public int getId(@Nullable K k0) { -@@ -54,9 +54,9 @@ public class RegistryID implements Registry { +@@ -55,9 +55,9 @@ public class RegistryID implements Registry { K[] ak = this.b; int[] aint = this.c; @@ -264,26 +149,27 @@ index 9400a4369..5a5c464ea 100644 this.f = 0; diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java -index c01a05b25..478bf4997 100644 +index 096277de1c..d484e626d2 100644 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java -@@ -39,14 +39,14 @@ public class WorldPersistentData { +@@ -37,7 +37,7 @@ public class WorldPersistentData { + if (t0 != null) { + return t0; + } else { +- T t1 = (PersistentBase) supplier.get(); ++ T t1 = supplier.get(); // Paper - decompile fix - @Nullable - public T a(Function function, String s) { -- PersistentBase persistentbase = (PersistentBase) this.data.get(s); -+ T persistentbase = (T) this.data.get(s); // Paper - decompile fix + this.a(t1); + return t1; +@@ -64,7 +64,7 @@ public class WorldPersistentData { + } + } - if (persistentbase == null && this.e != null) { - try { - File file = this.e.getDataFile(this.b, s); +- return persistentbase; ++ return (T) persistentbase; // Paper - decompile fix + } - if (file != null && file.exists()) { -- persistentbase = (PersistentBase) function.apply(s); -+ persistentbase = function.apply(s); // Paper - decompile fix - persistentbase.a(a(this.e, this.b, s, 1631).getCompound("data")); - this.data.put(s, persistentbase); - } + public void a(PersistentBase persistentbase) { -- 2.21.0 diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index e0dc1d7c5b..dcb2efdbbc 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,11 +1,11 @@ -From acf9c715648075076c1438814a611103748ec3a0 Mon Sep 17 00:00:00 2001 +From 8da836e8eedeba7af28f6260fa2084de50ec23ee Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils diff --git a/src/main/java/net/minecraft/server/AttributeInstance.java b/src/main/java/net/minecraft/server/AttributeInstance.java -index be179ba213..c53bc8230a 100644 +index 2f2b103641..b1900ba364 100644 --- a/src/main/java/net/minecraft/server/AttributeInstance.java +++ b/src/main/java/net/minecraft/server/AttributeInstance.java @@ -21,8 +21,10 @@ public interface AttributeInstance { @@ -20,55 +20,56 @@ index be179ba213..c53bc8230a 100644 void b(UUID uuid); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 13dc7abc50..9bb7c9c652 100644 +index 3745f66de5..01061f219f 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java -@@ -45,6 +45,7 @@ public class BlockPosition extends BaseBlockPosition { +@@ -120,6 +120,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2); } -+ public BlockPosition add(int i, int j, int k) {return a(i, j, k);} // Paper - OBFHELPER - public BlockPosition a(int i, int j, int k) { ++ public BlockPosition add(int i, int j, int k) {return b(i, j, k);} // Paper - OBFHELPER + public BlockPosition b(int i, int j, int k) { return i == 0 && j == 0 && k == 0 ? this : new BlockPosition(this.getX() + i, this.getY() + j, this.getZ() + k); } -@@ -183,6 +184,7 @@ public class BlockPosition extends BaseBlockPosition { - }; +@@ -207,6 +208,8 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali + return new BlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX()); } -+ public BlockPosition asImmutable() { return h(); } // Paper - OBFHELPER - public BlockPosition h() { ++ @Deprecated // We'll replace this... ++ public BlockPosition asImmutable() { return immutableCopy(); } // Paper - OBFHELPER + public BlockPosition immutableCopy() { return this; } -@@ -342,6 +344,7 @@ public class BlockPosition extends BaseBlockPosition { +@@ -391,6 +394,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali return this.d; } -+ public BlockPosition.MutableBlockPosition setValues(int i, int j, int k) { return c(i, j, k);} // Paper - OBFHELPER - public BlockPosition.MutableBlockPosition c(int i, int j, int k) { ++ public BlockPosition.MutableBlockPosition setValues(int i, int j, int k) { return d(i, j, k);} // Paper - OBFHELPER + public BlockPosition.MutableBlockPosition d(int i, int j, int k) { this.b = i; this.c = j; -@@ -349,6 +352,7 @@ public class BlockPosition extends BaseBlockPosition { - return this; +@@ -402,6 +406,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali + return this.c(entity.locX, entity.locY, entity.locZ); } + public BlockPosition.MutableBlockPosition setValues(double d0, double d1, double d2) { return c(d0, d1, d2);} // Paper - OBFHELPER public BlockPosition.MutableBlockPosition c(double d0, double d1, double d2) { - return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2)); + return this.d(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2)); } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 1ff78eed40..417c015e56 100644 +index 2d40f03b1a..0f031e862b 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -31,7 +31,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent; +@@ -32,7 +32,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent; public class Chunk implements IChunkAccess { - private static final Logger d = LogManager.getLogger(); + private static final Logger b = LogManager.getLogger(); - public static final ChunkSection a = null; + public static final ChunkSection a = null; public static final ChunkSection EMPTY_CHUNK_SECTION = Chunk.a; // Paper - OBFHELPER private final ChunkSection[] sections; - private final BiomeBase[] f; - private final boolean[] g; -@@ -704,6 +704,7 @@ public class Chunk implements IChunkAccess { + private final BiomeBase[] d; + private final Map e; +@@ -403,6 +403,7 @@ public class Chunk implements IChunkAccess { return this.a(blockposition, Chunk.EnumTileEntityState.CHECK); } @@ -77,36 +78,25 @@ index 1ff78eed40..417c015e56 100644 public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index 34586bca65..b0c004b1f2 100644 +index 857b2f8868..bbf136614c 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -@@ -24,6 +24,8 @@ public class ChunkCoordIntPair { - return a(this.x, this.z); +@@ -31,7 +31,9 @@ public class ChunkCoordIntPair { + return pair(this.x, this.z); } -+ public static long asLong(final BlockPosition pos) { return a(pos.getX() >> 4, pos.getZ() >> 4); } // Paper - OBFHELPER -+ public static long asLong(int x, int z) { return a(x, z); } // Paper - OBFHELPER - public static long a(int i, int j) { +- public static long pair(int i, int j) { ++ public static long asLong(final BlockPosition pos) { return pair(pos.getX() >> 4, pos.getZ() >> 4); } // Paper - OBFHELPER ++ public static long asLong(int x, int z) { return pair(x, z); } // Paper - OBFHELPER ++ public static long pair(int i, int j) { return (long) i & 4294967295L | ((long) j & 4294967295L) << 32; } -diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -index cc9604749b..70a95c2636 100644 ---- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -@@ -13,7 +13,7 @@ import org.apache.logging.log4j.Logger; - public class ChunkTaskScheduler extends Scheduler { - private static final Logger b = LogManager.getLogger(); -- private final World c; -+ private final World c; private final World getWorld() { return this.c; } // Paper - OBFHELPER - private final ChunkGenerator d; - private final IChunkLoader e; - private final IAsyncTaskHandler f; diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index d24ec3d53c..9e83610f1a 100644 +index 8bda055159..409dc837c6 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java -@@ -60,6 +60,7 @@ public class DataBits { +@@ -82,6 +82,7 @@ public class DataBits { } } @@ -115,22 +105,24 @@ index d24ec3d53c..9e83610f1a 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java -index dae40b9cde..2ee8791963 100644 +index 75ba698868..45403fbe30 100644 --- a/src/main/java/net/minecraft/server/DataPalette.java +++ b/src/main/java/net/minecraft/server/DataPalette.java -@@ -4,8 +4,10 @@ import javax.annotation.Nullable; +@@ -4,10 +4,12 @@ import javax.annotation.Nullable; public interface DataPalette { + default int getOrCreateIdFor(T object) { return this.a(object); } // Paper - OBFHELPER int a(T t0); + boolean b(T t0); + + @Nullable default T getObject(int dataBits) { return this.a(dataBits); } // Paper - OBFHELPER @Nullable T a(int i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 59cbbdcb3d..6fcfc5ef72 100644 +index 4411d5640a..28a6be7ab0 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; @@ -154,7 +146,7 @@ index 59cbbdcb3d..6fcfc5ef72 100644 + private int i; private int getBitsPerObject() { return this.i; } // Paper - OBFHELPER private final ReentrantLock j = new ReentrantLock(); - private void b() { + public void a() { @@ -53,6 +53,7 @@ public class DataPaletteBlock implements DataPaletteExpandable { return j << 8 | k << 4 | i; } @@ -163,31 +155,32 @@ index 59cbbdcb3d..6fcfc5ef72 100644 private void b(int i) { if (i != this.i) { this.i = i; -@@ -115,6 +116,7 @@ public class DataPaletteBlock implements DataPaletteExpandable { +@@ -130,6 +131,7 @@ public class DataPaletteBlock implements DataPaletteExpandable { return t0 == null ? this.g : t0; } + public void writeDataPaletteBlock(PacketDataSerializer packetDataSerializer) { this.b(packetDataSerializer); } // Paper - OBFHELPER public void b(PacketDataSerializer packetdataserializer) { - this.b(); + this.a(); packetdataserializer.writeByte(this.i); diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index 372afbe94e..20b7c2c6dc 100644 +index 7636358a70..8520680814 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java -@@ -6,6 +6,7 @@ import org.bukkit.event.entity.EntityUnleashEvent; +@@ -6,6 +6,8 @@ import org.bukkit.event.entity.EntityUnleashEvent; public abstract class EntityCreature extends EntityInsentient { + public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper - private BlockPosition a; - private float b; - ++ + protected EntityCreature(EntityTypes entitytypes, World world) { + super(entitytypes, world); + } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 8b2000f683..1a3517aeed 100644 +index 4720632641..afa03ce6f2 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java -@@ -125,6 +125,7 @@ public abstract class EntityInsentient extends EntityLiving { +@@ -143,6 +143,7 @@ public abstract class EntityInsentient extends EntityLiving { return this.goalTarget; } @@ -196,10 +189,10 @@ index 8b2000f683..1a3517aeed 100644 // CraftBukkit start - fire event setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d4fe0ab6bf..011c7af218 100644 +index 3e16632e24..d31c1c989c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity { +@@ -126,6 +126,7 @@ public abstract class EntityLiving extends Entity { public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes; public boolean collides = true; public boolean canPickUpLoot; @@ -208,85 +201,40 @@ index d4fe0ab6bf..011c7af218 100644 @Override public float getBukkitYaw() { diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java -index 5f9255df14..5ea5170436 100644 +index 6ab4c78b35..76142d5dc2 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java -@@ -2,11 +2,13 @@ package net.minecraft.server; +@@ -4,6 +4,7 @@ import java.util.function.Predicate; public abstract class EntityMonster extends EntityCreature implements IMonster { + public org.bukkit.craftbukkit.entity.CraftMonster getBukkitMonster() { return (org.bukkit.craftbukkit.entity.CraftMonster) super.getBukkitEntity(); } // Paper - protected EntityMonster(EntityTypes entitytypes, World world) { + protected EntityMonster(EntityTypes entitytypes, World world) { super(entitytypes, world); - this.b_ = 5; - } - -+ public SoundCategory getSoundCategory() { return bV(); } // Paper - OBFHELPER - public SoundCategory bV() { - return SoundCategory.HOSTILE; - } + this.f = 5; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index b8abd6363f..a07ee150c2 100644 +index 2ee4069173..0f2604a3d5 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java -@@ -3,6 +3,7 @@ package net.minecraft.server; - import com.mojang.datafixers.DataFixUtils; - import com.mojang.datafixers.types.Type; - -+import java.util.Map; - import java.util.Set; +@@ -5,6 +5,7 @@ import com.mojang.datafixers.types.Type; + import java.util.Collections; + import java.util.Optional; + import java.util.Set; // Paper ++import java.util.Map; // Paper import java.util.UUID; import java.util.function.Function; -@@ -123,9 +124,20 @@ public class EntityTypes { - public static EntityTypes a(String s, EntityTypes.a entitytypes_a) { - EntityTypes entitytypes = entitytypes_a.a(s); - -+ // Paper start -+ if (clsToKeyMap == null ) clsToKeyMap = new java.util.HashMap<>(); -+ if (clsToTypeMap == null ) clsToTypeMap = new java.util.HashMap<>(); -+ -+ MinecraftKey key = new MinecraftKey(s); -+ Class entityClass = entitytypes_a.getEntityClass(); - IRegistry.ENTITY_TYPE.a(new MinecraftKey(s), entitytypes); // CraftBukkit - decompile error -+ clsToKeyMap.put(entityClass, key); -+ clsToTypeMap.put(entityClass, org.bukkit.entity.EntityType.fromName(s)); - return entitytypes; - } -+ public static Map, MinecraftKey> clsToKeyMap; -+ public static Map, org.bukkit.entity.EntityType> clsToTypeMap; -+ // Paper end - - @Nullable - public static MinecraftKey getName(EntityTypes entitytypes) { -@@ -287,7 +299,7 @@ public class EntityTypes { - - public static class a { - -- private final Class a; -+ private final Class a; public Class getEntityClass() { return a; } // Paper - OBFHELPER - private final Function b; - private boolean c = true; - private boolean d = true; -@@ -338,7 +350,7 @@ public class EntityTypes { - - // Paper start - public static Set getEntityNameList() { -- return REGISTRY.keySet(); -+ return IRegistry.ENTITY_TYPE.keySet(); - } - // Paper end - } + import java.util.stream.Stream; diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 9e763b6e39..a7fc148591 100644 +index cc9851edbc..80a2da51da 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -36,10 +36,19 @@ import org.bukkit.event.world.StructureGrowEvent; +@@ -37,10 +37,19 @@ import org.bukkit.event.world.StructureGrowEvent; public final class ItemStack { private static final Logger c = LogManager.getLogger(); - public static final ItemStack a = new ItemStack((Item) null); + public static final ItemStack a = new ItemStack((Item) null);public static final ItemStack NULL_ITEM = a; // Paper - OBFHELPER - public static final DecimalFormat b = D(); + public static final DecimalFormat b = F(); private int count; private int e; + // Paper start @@ -301,7 +249,7 @@ index 9e763b6e39..a7fc148591 100644 @Deprecated private Item item; private NBTTagCompound tag; -@@ -590,6 +599,17 @@ public final class ItemStack { +@@ -588,6 +597,17 @@ public final class ItemStack { return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList(); } @@ -319,7 +267,7 @@ index 9e763b6e39..a7fc148591 100644 public void setTag(@Nullable NBTTagCompound nbttagcompound) { this.tag = nbttagcompound; } -@@ -674,6 +694,7 @@ public final class ItemStack { +@@ -672,6 +692,7 @@ public final class ItemStack { return this.tag != null && this.tag.hasKeyOfType("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false; } @@ -327,7 +275,7 @@ index 9e763b6e39..a7fc148591 100644 public void a(String s, NBTBase nbtbase) { this.getOrCreateTag().set(s, nbtbase); } -@@ -747,6 +768,7 @@ public final class ItemStack { +@@ -745,6 +766,7 @@ public final class ItemStack { // CraftBukkit start @Deprecated public void setItem(Item item) { @@ -658,7 +606,7 @@ index 0000000000..c97e116aaf + } +} diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 434471215d..8c5d6c1d38 100644 +index dfa33f0336..cc25ea7401 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -23,7 +23,7 @@ public class NBTTagCompound implements NBTBase { @@ -670,7 +618,7 @@ index 434471215d..8c5d6c1d38 100644 public NBTTagCompound() {} -@@ -95,11 +95,13 @@ public class NBTTagCompound implements NBTBase { +@@ -99,11 +99,15 @@ public class NBTTagCompound implements NBTBase { this.map.put(s, new NBTTagLong(i)); } @@ -680,12 +628,14 @@ index 434471215d..8c5d6c1d38 100644 this.setLong(s + "Least", uuid.getLeastSignificantBits()); } -+ public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER - @Nullable ++ ++ @Nullable public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER ++ @Nullable public UUID a(String s) { return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least")); + } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index d85bc522c3..e2fc41d6d1 100644 +index 94e6a3db4c..fca496a00a 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -43,7 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -713,7 +663,7 @@ index d85bc522c3..e2fc41d6d1 100644 private void o() { if (this.channel != null && this.channel.isOpen()) { this.j.readLock().lock(); -@@ -333,9 +335,9 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -337,9 +339,9 @@ public class NetworkManager extends SimpleChannelInboundHandler> { static class QueuedPacket { @@ -726,7 +676,7 @@ index d85bc522c3..e2fc41d6d1 100644 public QueuedPacket(Packet packet, @Nullable GenericFutureListener> genericfuturelistener) { this.a = packet; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 7582151ae4..d05f1e02cf 100644 +index db2fe836c2..0d67676f7d 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -750,31 +700,40 @@ index d54177bdcc..2aa805eef1 100644 throw new SkipEncodeException(throwable); } else { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 395215bbdd..f2159bc2dd 100644 +index 0dda7aaf69..363ab5da12 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -@@ -13,7 +13,7 @@ public class PacketPlayOutMapChunk implements Packet { - private int a; +@@ -14,7 +14,7 @@ public class PacketPlayOutMapChunk implements Packet { private int b; private int c; -- private byte[] d; -+ private byte[] d; private byte[] getData() { return this.d; } // Paper - OBFHELPER - private List e; - private boolean f; + private NBTTagCompound d; +- private byte[] e; ++ private byte[] e; private byte[] getData() { return this.e; } // Paper - OBFHELPER + private List f; + private boolean g; -@@ -97,6 +97,7 @@ public class PacketPlayOutMapChunk implements Packet { +@@ -114,6 +114,7 @@ public class PacketPlayOutMapChunk implements Packet { return bytebuf; } -+ public int writeChunk(PacketDataSerializer packetDataSerializer, Chunk chunk, boolean writeSkyLightArray, int chunkSectionSelector) { return this.a(packetDataSerializer, chunk, writeSkyLightArray, chunkSectionSelector); } // Paper - OBFHELPER - public int a(PacketDataSerializer packetdataserializer, Chunk chunk, boolean flag, int i) { ++ public int writeChunk(PacketDataSerializer packetDataSerializer, Chunk chunk, int chunkSectionSelector) { return this.a(packetDataSerializer, chunk, chunkSectionSelector); } // Paper - OBFHELPER + public int a(PacketDataSerializer packetdataserializer, Chunk chunk, int i) { int j = 0; ChunkSection[] achunksection = chunk.getSections(); +@@ -134,7 +135,7 @@ public class PacketPlayOutMapChunk implements Packet { + BiomeBase[] abiomebase = chunk.getBiomeIndex(); + + for (l = 0; l < abiomebase.length; ++l) { +- packetdataserializer.writeInt(IRegistry.BIOME.a((Object) abiomebase[l])); ++ packetdataserializer.writeInt(IRegistry.BIOME.a(abiomebase[l])); // Paper - decompile fix + } + } + diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index aac5f9bfa9..06f90ceca5 100644 +index 10ebb23c66..23e37b5008 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -69,9 +69,9 @@ public class PlayerConnection implements PacketListenerPlayIn { private final MinecraftServer minecraftServer; public EntityPlayer player; private int e; @@ -788,20 +747,20 @@ index aac5f9bfa9..06f90ceca5 100644 private volatile int chatThrottle; private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java -index 997fdc4997..988a361195 100644 +index a5dba62caf..a088658ae0 100644 --- a/src/main/java/net/minecraft/server/PlayerInventory.java +++ b/src/main/java/net/minecraft/server/PlayerInventory.java -@@ -20,7 +20,7 @@ public class PlayerInventory implements IInventory { +@@ -17,7 +17,7 @@ public class PlayerInventory implements IInventory, INamableTileEntity { public final NonNullList items; public final NonNullList armor; public final NonNullList extraSlots; - private final List> f; + private final List> f;List> getComponents() { return f; } // Paper - OBFHELPER public int itemInHandIndex; - public EntityHuman player; + public final EntityHuman player; private ItemStack carried; diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java -index 6740b396a1..ea08c5a1c8 100644 +index b3824898da..bf4172be52 100644 --- a/src/main/java/net/minecraft/server/PotionUtil.java +++ b/src/main/java/net/minecraft/server/PotionUtil.java @@ -110,6 +110,7 @@ public class PotionUtil { @@ -813,10 +772,10 @@ index 6740b396a1..ea08c5a1c8 100644 MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry); diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java -index a894f7886d..93935e7c77 100644 +index 4efcb8b595..60948afa4e 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java -@@ -56,6 +56,7 @@ public class RegistryBlockID implements Registry { +@@ -57,6 +57,7 @@ public class RegistryBlockID implements Registry { return Iterators.filter(this.c.iterator(), Predicates.notNull()); } @@ -825,10 +784,10 @@ index a894f7886d..93935e7c77 100644 return this.b.size(); } diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 8cb97b894a..5e71d2ac27 100644 +index ea90a01830..59e7d907ef 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java -@@ -35,8 +35,8 @@ public class SystemUtils { +@@ -45,8 +45,8 @@ public class SystemUtils { return Collectors.toMap(Entry::getKey, Entry::getValue); } @@ -839,7 +798,7 @@ index 8cb97b894a..5e71d2ac27 100644 } public static String a(String s, @Nullable MinecraftKey minecraftkey) { -@@ -48,7 +48,7 @@ public class SystemUtils { +@@ -58,7 +58,7 @@ public class SystemUtils { } public static long getMonotonicNanos() { @@ -848,16 +807,7 @@ index 8cb97b894a..5e71d2ac27 100644 } public static long getTimeMillis() { -@@ -108,7 +108,7 @@ public class SystemUtils { - futuretask.run(); - return futuretask.get(); - } catch (ExecutionException executionexception) { -- logger.fatal("Error executing task", executionexception); -+ logger.fatal("Error executing task", executionexception.getCause() != null ? executionexception.getCause() : executionexception); // Paper - } catch (InterruptedException interruptedexception) { - logger.fatal("Error executing task", interruptedexception); - } -@@ -144,8 +144,8 @@ public class SystemUtils { +@@ -154,8 +154,8 @@ public class SystemUtils { public static T b(Iterable iterable, @Nullable T t0) { Iterator iterator = iterable.iterator(); @@ -868,20 +818,29 @@ index 8cb97b894a..5e71d2ac27 100644 for (object1 = null; iterator.hasNext(); object1 = object) { object = iterator.next(); -@@ -170,7 +170,7 @@ public class SystemUtils { +@@ -180,7 +180,7 @@ public class SystemUtils { } - public static Strategy g() { + public static Strategy i() { - return SystemUtils.IdentityHashingStrategy.INSTANCE; + return (Strategy) IdentityHashingStrategy.INSTANCE; // Paper - decompile fix } - static enum IdentityHashingStrategy implements Strategy { + public static CompletableFuture> b(List> list) { +@@ -191,7 +191,7 @@ public class SystemUtils { + list.forEach((completablefuture1) -> { + int i = list1.size(); + +- list1.add((Object) null); ++ list1.add(null); // Paper - decompile fix + acompletablefuture[i] = completablefuture1.whenComplete((object, throwable) -> { + if (throwable != null) { + completablefuture.completeExceptionally(throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 2ef4ac64b2..f907d4f3b7 100644 +index c4aa0152c8..6e44e58c58 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -94,6 +94,7 @@ public final class CraftItemStack extends ItemStack { +@@ -91,6 +91,7 @@ public final class CraftItemStack extends ItemStack { } net.minecraft.server.ItemStack handle; diff --git a/Spigot-Server-Patches/0005-Paper-Metrics.patch b/Spigot-Server-Patches/0005-Paper-Metrics.patch index 18b3490e1f..ca244b750f 100644 --- a/Spigot-Server-Patches/0005-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0005-Paper-Metrics.patch @@ -1,4 +1,4 @@ -From f1a6ed4b7cd1fe9d614bcc100d83226d9b7e529f Mon Sep 17 00:00:00 2001 +From 1b20e74bcb7f3a0073b7faeef1c3fb26ca3209f7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -15,7 +15,7 @@ decisions on behalf of the project. diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java new file mode 100644 -index 000000000..e257d6b36 +index 0000000000..e257d6b36e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -0,0 +1,627 @@ @@ -647,7 +647,7 @@ index 000000000..e257d6b36 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f0473d9bf..255b8bed0 100644 +index db79fe41b9..5518ec1e54 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -41,6 +41,7 @@ public class PaperConfig { @@ -671,7 +671,7 @@ index f0473d9bf..255b8bed0 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 11c4d53df..fe3bad583 100644 +index 11c4d53dfa..fe3bad5830 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -83,6 +83,7 @@ public class SpigotConfig @@ -691,5 +691,5 @@ index 11c4d53df..fe3bad583 100644 static void readConfig(Class clazz, Object instance) -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch index 94554bbccb..7eac81ad31 100644 --- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch +++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch @@ -1,4 +1,4 @@ -From ce9840a8f99f46154e941de2d8560f0333f459a8 Mon Sep 17 00:00:00 2001 +From f01b6961ade709b2e4076e4c8bc65ca191af034d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 01:40:13 -0400 Subject: [PATCH] Add MinecraftKey Information to Objects @@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects Stores the reference to the objects respective MinecraftKey diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 2e79b0b5f..f38179e98 100644 +index 2e79b0b5ff..f38179e983 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -175,7 +175,7 @@ public class PaperCommand extends Command { @@ -19,7 +19,7 @@ index 2e79b0b5f..f38179e98 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index cd998fcfb..d9c9748ce 100644 +index cd998fcfb5..d9c9748cec 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -44,7 +44,7 @@ import org.bukkit.event.entity.EntityPortalEvent; @@ -75,7 +75,7 @@ index cd998fcfb..d9c9748ce 100644 protected abstract void a(NBTTagCompound nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index a07ee150c..d74bfa120 100644 +index a07ee150c2..d74bfa1201 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -240,6 +240,7 @@ public class EntityTypes { @@ -88,7 +88,7 @@ index a07ee150c..d74bfa120 100644 } diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java new file mode 100644 -index 000000000..743142d03 +index 0000000000..743142d030 --- /dev/null +++ b/src/main/java/net/minecraft/server/KeyedObject.java @@ -0,0 +1,9 @@ @@ -102,7 +102,7 @@ index 000000000..743142d03 + } +} diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 62b6e6eb3..7390061bf 100644 +index 62b6e6eb38..7390061bf0 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -7,11 +7,11 @@ import org.apache.logging.log4j.Logger; diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch index 14c72489b7..ec3d5bac94 100644 --- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch +++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch @@ -1,4 +1,4 @@ -From b9facb273ca6721a832a5e9c4f7cf69ab6e5bbf6 Mon Sep 17 00:00:00 2001 +From b62193df23ee54b4b15077fd0ac4939003ac99aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:10:36 -0400 Subject: [PATCH] Store reference to current Chunk for Entity and Block diff --git a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch index 98b2adfd81..643c6d0731 100644 --- a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch +++ b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch @@ -1,4 +1,4 @@ -From dbaafc47c5209214b5bd44396640cbf5da05c453 Mon Sep 17 00:00:00 2001 +From 9e8dc233b5846b4e81ae4964ddb0a48a75b64c23 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:13:59 -0400 Subject: [PATCH] Store counts for each Entity/Block Entity Type diff --git a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch index 27fbb8ca54..9a14f99fe9 100644 --- a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,11 +1,11 @@ -From a33afed850b70f0bb7a2da14d0ea528dad769f8a Mon Sep 17 00:00:00 2001 +From 77786f5eecb8349c36a8926fa9f13a230c4594ec Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a73865739..098bd3fba 100644 +index a738657394..098bd3fba8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -64,4 +64,13 @@ public class PaperWorldConfig { @@ -23,7 +23,7 @@ index a73865739..098bd3fba 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index 27758bd01..918db3626 100644 +index 625b9a049f..b6806d8db3 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -29,7 +29,7 @@ public class BlockCactus extends Block { @@ -36,7 +36,7 @@ index 27758bd01..918db3626 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index fad1a0a83..c7017c58e 100644 +index fad1a0a83c..c7017c58e7 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -25,7 +25,7 @@ public class BlockReed extends Block { @@ -49,5 +49,5 @@ index fad1a0a83..c7017c58e 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.19.2 +2.21.0 diff --git a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch index 4c18e88da5..6e5181c69d 100644 --- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch @@ -1,4 +1,4 @@ -From 478b9e5309586023d078cba0bc4b0d22a129f686 Mon Sep 17 00:00:00 2001 +From c5b2c65f35f14d8c0bfee7cf4b6d98ed4eff89b2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed @@ -45,5 +45,5 @@ index e3d52e7cf7..002be7f7be 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index 476c1d849a..bfa2dd5311 100644 --- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -1,11 +1,11 @@ -From 0412e6ba2083b44da0a780abf51da476268e1107 Mon Sep 17 00:00:00 2001 +From 3c9cc110ddcacd96a032d910e15dbcaff3d43473 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 55d8e74f8..a55163a45 100644 +index 55d8e74f82..a55163a458 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -79,4 +79,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 55d8e74f8..a55163a45 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 83cfbd218..fd6ada184 100644 +index 39499f0743..118b974d76 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -386,8 +386,9 @@ public class EntityFishingHook extends Entity { diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch index 4283ce01dc..ca61df02ed 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch @@ -1,11 +1,11 @@ -From 92ac86da3d4646d3219b8d7a4984c2690acd9467 Mon Sep 17 00:00:00 2001 +From 52b62639d8961610094976f5c68b9d3caf0bda60 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a55163a45..341038fc4 100644 +index a55163a458..341038fc4d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -87,4 +87,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index a55163a45..341038fc4 100644 + } } diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java -index 4ed5192c6..489beed26 100644 +index 4ed5192c65..489beed269 100644 --- a/src/main/java/net/minecraft/server/ControllerJump.java +++ b/src/main/java/net/minecraft/server/ControllerJump.java @@ -13,6 +13,7 @@ public class ControllerJump { @@ -31,7 +31,7 @@ index 4ed5192c6..489beed26 100644 this.b.o(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index cca047b04..f31f31c37 100644 +index 1a3517aeed..2bfd5fe2d8 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -33,6 +33,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -56,7 +56,7 @@ index cca047b04..f31f31c37 100644 } // Spigot End diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java -index 0d9505138..38a0b2db1 100644 +index 0d95051383..38a0b2db1e 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java @@ -6,14 +6,17 @@ public class PathfinderGoalFloat extends PathfinderGoal { @@ -78,5 +78,5 @@ index 0d9505138..38a0b2db1 100644 if (this.a.getRandom().nextFloat() < 0.8F) { this.a.getControllerJump().a(); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch index 888328c82d..ddb5d3818b 100644 --- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,11 +1,11 @@ -From 0d8ee36dbb6764ff3cde5a629eee498f7c4240e7 Mon Sep 17 00:00:00 2001 +From 8f3d832ee04d29536a8b70ff9c830a9f573a7112 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 341038fc4..3e1f4be10 100644 +index 341038fc4d..3e1f4be10f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -92,4 +92,20 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 341038fc4..3e1f4be10 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index f31f31c37..42a073d70 100644 +index 2bfd5fe2d8..80d872e797 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -626,13 +626,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -51,5 +51,5 @@ index f31f31c37..42a073d70 100644 } } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch index 314fcd5c44..b98db17294 100644 --- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch @@ -1,11 +1,11 @@ -From 3ed33183490ced591c999e8c19b6d5294c822b43 Mon Sep 17 00:00:00 2001 +From d8c63a9b9619e7934ca20c09f63909e16f6fa012 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 03:53:43 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3e1f4be10..3f734327c 100644 +index 3e1f4be10f..3f734327c0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -108,4 +108,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 3e1f4be10..3f734327c 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a1c5375a5..51df93b18 100644 +index ad792af2bc..f24ee385cd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -201,6 +201,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -32,5 +32,5 @@ index a1c5375a5..51df93b18 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index 7cc973fdb2..d656694c9f 100644 --- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,4 +1,4 @@ -From 320dd5815173fe4d72fc4cdf0477f3fb46b9e86c Mon Sep 17 00:00:00 2001 +From 7b97269d9fb6b8c56c684946f4f85a3fe07d8b6f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height @@ -24,7 +24,7 @@ index 3f734327c0..1ed58f4bba 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e329c2f48a..2b4a784e4d 100644 +index 131946154e..2198182ec9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1879,6 +1879,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -58,7 +58,7 @@ index 4e4c8cc501..a6eae266de 100644 blockposition = new BlockPosition(this); boolean flag = this.block.getBlock() instanceof BlockConcretePowder; diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 3977498c4b..5dc52b6b89 100644 +index e3a03782c8..8c19278f37 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity { @@ -76,5 +76,5 @@ index 3977498c4b..5dc52b6b89 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 5d6558c222..2e4e58c133 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 83ac8b89abec618036297a83e2c283b749110729 Mon Sep 17 00:00:00 2001 +From 39a20240b9b506f4bba726d5504af0c03588988d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 220ca7bca..e13e17bdd 100644 +index 220ca7bca0..e13e17bdd2 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -52,7 +52,7 @@ public class EULA { @@ -19,7 +19,7 @@ index 220ca7bca..e13e17bdd 100644 EULA.a.warn("Failed to save {}", this.b, exception); } finally { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7e89d7158..df85f35f3 100644 +index 7e89d7158b..df85f35f37 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1209,7 +1209,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -32,7 +32,7 @@ index 7e89d7158..df85f35f3 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 18619e675..bce04674f 100644 +index fea49800d8..351313d98c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -164,7 +164,7 @@ import org.bukkit.event.server.TabCompleteEvent; @@ -45,7 +45,7 @@ index 18619e675..bce04674f 100644 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 24620a8b8..56aa64bdf 100644 +index 3e7024780b..c85a9bfb91 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,12 +200,25 @@ public class Main { @@ -76,7 +76,7 @@ index 24620a8b8..56aa64bdf 100644 MinecraftServer.main(options); } catch (Throwable t) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 9511f247a..8e32c4e2c 100644 +index 9511f247a6..8e32c4e2cd 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread @@ -116,5 +116,5 @@ index 9511f247a..8e32c4e2c 100644 log.log( Level.SEVERE, "------------------------------" ); // -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch index e8820ec921..1915d9c2f5 100644 --- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 7d7c425eb85ecf76e8fb6c580c39789e2dc1e6b3 Mon Sep 17 00:00:00 2001 +From dd41359854bea49f22cccaea44e75262062369f2 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 050f21efa..58e037e13 100644 +index 050f21efa5..58e037e13b 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -68,6 +68,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 050f21efa..58e037e13 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 80d872e79..e5322de97 100644 +index 80d872e797..e5322de974 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -620,7 +620,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -32,7 +32,7 @@ index 80d872e79..e5322de97 100644 double d1 = entityhuman.locY - this.locY; double d2 = entityhuman.locZ - this.locZ; diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 3c566ebd0..ba40e03fc 100644 +index 3c566ebd0e..ba40e03fcc 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -96,7 +96,7 @@ public class EntitySilverfish extends EntityMonster { @@ -45,7 +45,7 @@ index 3c566ebd0..ba40e03fc 100644 return false; } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 6ca0e19cb..4eaa5d93b 100644 +index 6ca0e19cb9..4eaa5d93b4 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -37,7 +37,7 @@ public final class SpawnerCreature { @@ -58,7 +58,7 @@ index 6ca0e19cb..4eaa5d93b 100644 j = MathHelper.floor(entityhuman.locZ / 16.0D); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f24ee385c..106ad00dc 100644 +index f24ee385cd..106ad00dc7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -30,6 +30,7 @@ import org.bukkit.craftbukkit.CraftWorld; @@ -79,7 +79,7 @@ index f24ee385c..106ad00dc 100644 if (d3 < 0.0D || d4 < d3 * d3) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 99f99148d..15c2e1dee 100644 +index 99f99148d6..15c2e1dee7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1613,7 +1613,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch index e5409e79c0..a87d922487 100644 --- a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,4 +1,4 @@ -From 80a584557c916ec5acd1ac5f5b5c0bdd45023f02 Mon Sep 17 00:00:00 2001 +From e73aad40de93a92039325077c5df36af6786dd22 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch index ba412cf44a..4cdc29fe95 100644 --- a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch @@ -1,11 +1,11 @@ -From 38eae291e775cae8925a2d2b580a30f09cecd2d5 Mon Sep 17 00:00:00 2001 +From a9d542b68c57c3744614b77947da9e5db95321c3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 22:55:25 -0600 Subject: [PATCH] Optimize TileEntity Ticking diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 2b03896e2..c46b761cc 100644 +index 2b03896e23..c46b761cc5 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -91,7 +91,7 @@ index 2b03896e2..c46b761cc 100644 int newPower = Math.max(0, Math.min(15, this.f)); diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java -index ee19595d3..f2df6f395 100644 +index ee19595d33..f2df6f3950 100644 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java @@ -1,6 +1,6 @@ @@ -157,5 +157,5 @@ index ee19595d3..f2df6f395 100644 public boolean a(EntityHuman entityhuman) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch index 35c9b188a0..e8eb113bab 100644 --- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From c0d1faf046517654abb00da0e2a9840b56985eb7 Mon Sep 17 00:00:00 2001 +From 253aab4a0dbe60736581c7036f6dc994f02d49a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index df85f35f3..7ca7b9f3a 100644 +index df85f35f37..7ca7b9f3ac 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -141,7 +141,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -161,7 +161,7 @@ index df85f35f3..7ca7b9f3a 100644 this.nextTick += 50L; // Spigot end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 351313d98..7b4af7a90 100644 +index 351313d98c..7b4af7a904 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1983,6 +1983,17 @@ public final class CraftServer implements Server { @@ -183,7 +183,7 @@ index 351313d98..7b4af7a90 100644 { diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -index be2e31dea..6d21c3269 100644 +index be2e31deae..6d21c32692 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -1,8 +1,5 @@ diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch index 24c394bf98..89f6ba899e 100644 --- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch @@ -1,11 +1,11 @@ -From c049f55ba4784e3ac7875678b626a32b51e8fc2c Mon Sep 17 00:00:00 2001 +From 46d9253b86272626d7bb064aabf9a8ed19217f02 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 15c2e1dee..0ee063bcd 100644 +index 15c2e1dee7..0ee063bcd3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1302,12 +1302,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch index c86ee68c81..a070cdd086 100644 --- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From ea910af0ba9f49a09f896d853da4893c29bdd0a5 Mon Sep 17 00:00:00 2001 +From 9cc3c4b16c1f83dc857837cbe19b285814ae0b0c Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6150eb1fc..bff44d535 100644 +index 2198182ec9..b4b73dbfd3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -160,6 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -51,7 +51,7 @@ index 6150eb1fc..bff44d535 100644 NBTTagList nbttaglist = new NBTTagList(); double[] adouble1 = adouble; diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index a6eae266d..489dd861d 100644 +index a6eae266de..489dd861d2 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -249,6 +249,14 @@ public class EntityFallingBlock extends Entity { @@ -70,7 +70,7 @@ index a6eae266d..489dd861d 100644 public void a(boolean flag) { diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 8c19278f3..7f4b68dcc 100644 +index 8c19278f37..7f4b68dcc0 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -108,6 +108,14 @@ public class EntityTNTPrimed extends Entity { @@ -89,7 +89,7 @@ index 8c19278f3..7f4b68dcc 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index 27debcfca..22027321b 100644 +index 27debcfca9..22027321bd 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -182,6 +182,7 @@ public class NBTTagList extends NBTList { @@ -101,7 +101,7 @@ index 27debcfca..22027321b 100644 if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 106ad00dc..470f40622 100644 +index 106ad00dc7..470f406227 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -918,6 +918,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -118,7 +118,7 @@ index 106ad00dc..470f40622 100644 flag = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 7edbbb106..660e59ba1 100644 +index 7edbbb106b..660e59ba15 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -816,4 +816,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch index c3aaefb02e..f25e49db7a 100644 --- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch @@ -1,11 +1,11 @@ -From 450f1569886930ab72e304d38a2a369e50d37249 Mon Sep 17 00:00:00 2001 +From 425aae4f7f3a850716d02b84e961b8af34fdec04 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:52:34 -0600 Subject: [PATCH] Prevent tile entity and entity crashes diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 68ac014aa..c5212417c 100644 +index 68ac014aab..c5212417c6 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -178,7 +178,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -23,7 +23,7 @@ index 68ac014aa..c5212417c 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7e73e00ce..891f0bb35 100644 +index 470f406227..b10e4c409d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1147,10 +1147,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -62,5 +62,5 @@ index 7e73e00ce..891f0bb35 100644 // Spigot start finally { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch index 3b2095bca6..e63cdb486c 100644 --- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch @@ -1,11 +1,11 @@ -From f7b834bdab10e17a64f8bc34a000dd44ce295b40 Mon Sep 17 00:00:00 2001 +From daccf0e889a168098bd6db251c164a2c0c3a1c2c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1ed58f4bb..a797a5767 100644 +index 1ed58f4bba..a797a57671 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -124,4 +124,19 @@ public class PaperWorldConfig { @@ -29,7 +29,7 @@ index 1ed58f4bb..a797a5767 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index bff44d535..6804b7274 100644 +index b4b73dbfd3..ad30cdd824 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -75,7 +75,7 @@ index bff44d535..6804b7274 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 205251bcd..0f531e7d4 100644 +index 205251bcdd..0f531e7d42 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -193,9 +193,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT diff --git a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch index 82b85eca4e..90485def35 100644 --- a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,11 +1,11 @@ -From e46af66d39e91ea1e7ebf40c9e48fb40b2dfe506 Mon Sep 17 00:00:00 2001 +From c086f9f25ffe26781c60c9478f3a4882bb4fd620 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index ee28e4d401..0fd6efec0b 100644 +index 3d5aaf052b..c4173c0aad 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -166,7 +166,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { @@ -18,5 +18,5 @@ index ee28e4d401..0fd6efec0b 100644 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) -- -2.18.0 +2.21.0 diff --git a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch index a25e8dc8b5..96b7654d7f 100644 --- a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch @@ -1,11 +1,11 @@ -From a6178a71228bfa2e44befadaf43a8ff9ce0b1a9e Mon Sep 17 00:00:00 2001 +From 9c6780d7a876397d8bdc4b460242ba9ca91fcac0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index f68e42c4d..1aade75f3 100644 +index a99c0cea0f..a95f93eb76 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature; @@ -25,5 +25,5 @@ index f68e42c4d..1aade75f3 100644 || entity instanceof EntityFireworks || entity instanceof EntityThrownTrident ) -- -2.18.0 +2.21.0 diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch index aa6bc6d642..9a7b4da064 100644 --- a/Spigot-Server-Patches/0028-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From b85bbfb42e8b12aa8e73894b0ad478c734d12f1d Mon Sep 17 00:00:00 2001 +From 121e2e7e17e70d345dd182ab23b4b02810174b18 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch index 32b66e7cfb..ca69092167 100644 --- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch @@ -1,11 +1,11 @@ -From 17bb8cb79a49ccbe456823a7318af6d6018b9453 Mon Sep 17 00:00:00 2001 +From a242286ea939a153321c6c4991f0783eac81ef5d Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 59d82fa4f..012182378 100644 +index 59d82fa4fb..012182378a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -147,4 +147,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 59d82fa4f..012182378 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0902c69f3..c4a55c6a1 100644 +index 0902c69f33..c4a55c6a1f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -58,7 +58,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch index ddf7c8ce24..c1507013ce 100644 --- a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,11 +1,11 @@ -From c32e5c2cb240c0c70aad5d9c62b49b28a265ffa1 Mon Sep 17 00:00:00 2001 +From 6298f2d72de6b88b59b1e49f27c7dd1051f2406a Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 33809baf2..c4db6367e 100644 +index 33809baf2e..c4db6367e9 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -111,7 +111,14 @@ public class Explosion { @@ -25,7 +25,7 @@ index 33809baf2..c4db6367e 100644 for (int l1 = 0; l1 < list.size(); ++l1) { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 8225a8258..bbcbb6232 100644 +index 8225a82582..bbcbb62325 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -14,6 +14,7 @@ public final class IEntitySelector { @@ -37,5 +37,5 @@ index 8225a8258..bbcbb6232 100644 return !(entity instanceof EntityHuman) || !((EntityHuman) entity).isSpectator() && !((EntityHuman) entity).u(); }; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0031-Optimize-explosions.patch b/Spigot-Server-Patches/0031-Optimize-explosions.patch index fbaed060f3..b28e99f2c6 100644 --- a/Spigot-Server-Patches/0031-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0031-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 76f17072927f08a5f8157937ae7546aee879754b Mon Sep 17 00:00:00 2001 +From 108ccce3714a95b77fa57a54360b303554bd4956 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 012182378..a39451c69 100644 +index 012182378a..a39451c69a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -153,4 +153,10 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index 012182378..a39451c69 100644 + } } diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index c4db6367e..3e44b2d54 100644 +index c4db6367e9..3e44b2d549 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -137,7 +137,7 @@ public class Explosion { @@ -124,7 +124,7 @@ index c4db6367e..3e44b2d54 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 00f1c36e9..f488c37f7 100644 +index 00f1c36e99..f488c37f73 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1055,6 +1055,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -136,7 +136,7 @@ index 00f1c36e9..f488c37f7 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f3755fcfb..20990cbfd 100644 +index f3755fcfbe..20990cbfdd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -22,6 +22,7 @@ import org.apache.logging.log4j.Logger; diff --git a/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch index 1f7eb0a01f..237194dbab 100644 --- a/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From b17663fbf677eecd6fbf6267217415c338faf4f2 Mon Sep 17 00:00:00 2001 +From 22baa6be4daa8a11770411b50f1fbf545196407d Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 58e037e13..e97bb2305 100644 +index 58e037e13b..e97bb2305c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -71,6 +71,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -25,7 +25,7 @@ index 58e037e13..e97bb2305 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 45ab33d1a..3854ae976 100644 +index 45ab33d1ae..3854ae9769 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -200,6 +200,7 @@ public class EntityTracker { @@ -37,7 +37,7 @@ index 45ab33d1a..3854ae976 100644 Iterator iterator = this.c.iterator(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index d00401ce1..dd6c84b4a 100644 +index d00401ce14..dd6c84b4a2 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -435,7 +435,7 @@ public class EntityTrackerEntry { @@ -50,7 +50,7 @@ index d00401ce1..dd6c84b4a 100644 return d0 >= (double) (-i) && d0 <= (double) i && d1 >= (double) (-i) && d1 <= (double) i && this.tracker.a(entityplayer); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index e01222ad2..55161af9c 100644 +index e01222ad2b..55161af9c9 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -33,7 +33,7 @@ public class PlayerChunkMap { @@ -221,7 +221,7 @@ index e01222ad2..55161af9c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 4eaa5d93b..6720a9648 100644 +index 4eaa5d93b4..6720a9648e 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -44,7 +44,7 @@ public final class SpawnerCreature { @@ -234,7 +234,7 @@ index 4eaa5d93b..6720a9648 100644 for (int i1 = -b0; i1 <= b0; ++i1) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0ee063bcd..5496fae40 100644 +index 0ee063bcd3..5496fae409 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1626,6 +1626,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -255,7 +255,7 @@ index 0ee063bcd..5496fae40 100644 @Override diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index a95f93eb7..09df00e94 100644 +index a95f93eb76..09df00e94b 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -108,13 +108,13 @@ public class ActivationRange diff --git a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch index b5754b05a1..a900bdf472 100644 --- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch @@ -1,11 +1,11 @@ -From 9c6c3d95e82c1e6e446e14bf31504388fcbc6403 Mon Sep 17 00:00:00 2001 +From cf24658d7888f1e4ca7faa4fa85c90cf87f3da29 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a39451c69..65a99b2a4 100644 +index a39451c69a..65a99b2a4b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -159,4 +159,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index a39451c69..65a99b2a4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b092b0fa2..c5cc0b471 100644 +index b092b0fa23..c5cc0b471b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1006,6 +1006,7 @@ public abstract class EntityLiving extends Entity { @@ -48,7 +48,7 @@ index b092b0fa2..c5cc0b471 100644 if (!this.e(damagesource)) { SoundEffect soundeffect = this.cs(); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 3e44b2d54..5591ccb3b 100644 +index 3e44b2d549..5591ccb3b0 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -153,7 +153,7 @@ public class Explosion { diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index b2d9219a11..406f14eb45 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -1,11 +1,11 @@ -From 1988234e00e21b0bb7ac4b5ce6b91f6c4f95828a Mon Sep 17 00:00:00 2001 +From 51dcc0bca12b8920ea29368566fd594a27f02dd8 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 65a99b2a4..0ba604ffc 100644 +index 65a99b2a4b..0ba604ffcf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -164,4 +164,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 65a99b2a4..0ba604ffc 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5a7087c75..716c3ddb8 100644 +index 5a7087c758..716c3ddb8c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -474,7 +474,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index 96e0ec40d7..9c3aecc788 100644 --- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch @@ -1,11 +1,11 @@ -From b5f0de38c2e522d97fa115f456ff2e1c7c956fe0 Mon Sep 17 00:00:00 2001 +From c5a235ad0ea3ac72b8ec52709c4501dc9e484467 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0ba604ffc..8b3c7b05c 100644 +index 0ba604ffcf..8b3c7b05c3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -169,4 +169,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 0ba604ffc..8b3c7b05c 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 716c3ddb8..ed6f3afcf 100644 +index 716c3ddb8c..ed6f3afcfe 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -496,7 +496,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch index f308010efc..9047eed1da 100644 --- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch @@ -1,11 +1,11 @@ -From cce68ac47a1a79807f128345cbdad59a734d56d0 Mon Sep 17 00:00:00 2001 +From 0debd2105cbb41e08ad37942d0b964e14b8d703d Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8b3c7b05c..7c16ec997 100644 +index 8b3c7b05c3..7c16ec9970 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -174,4 +174,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 8b3c7b05c..7c16ec997 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index cc0371b4a..ce43b4bc5 100644 +index cc0371b4aa..ce43b4bc52 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -22,6 +22,7 @@ public abstract class MobSpawnerAbstract { diff --git a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch index cf98a554cd..b04f97045e 100644 --- a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -1,11 +1,11 @@ -From 027d9ba0aeedf51baf08e9b0c824b80098818a7f Mon Sep 17 00:00:00 2001 +From fe8bd60fe7b27283c696a5b746414187695174b0 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 2 Mar 2016 23:13:07 -0600 Subject: [PATCH] Send absolute position the first time an entity is seen diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index dd6c84b4a..de0cf6b73 100644 +index dd6c84b4a2..de0cf6b735 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -41,7 +41,19 @@ public class EntityTrackerEntry { @@ -83,5 +83,5 @@ index dd6c84b4a..de0cf6b73 100644 entityplayer.playerConnection.sendPacket(packet); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch index dc3c41d964..bb18f0afc8 100644 --- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch @@ -1,11 +1,11 @@ -From 871f28247f535e856bec4dc25075e67463e5391f Mon Sep 17 00:00:00 2001 +From fc85165d72c6b28d04036eaf70235f61b59f55e7 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index fecd65ddb..c6bd54a2c 100644 +index fecd65ddb8..c6bd54a2c9 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -15,6 +15,12 @@ import org.bukkit.entity.HumanEntity; @@ -68,5 +68,5 @@ index fecd65ddb..c6bd54a2c 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch index 4d089c1367..08503052a8 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -1,11 +1,11 @@ -From 1db25ac54ccde81938bb34496f242edb1f50a4ef Mon Sep 17 00:00:00 2001 +From c016580d4adc343720538d924999686d912bb2f2 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7c16ec997..4266a87fe 100644 +index 7c16ec9970..4266a87fe3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -179,4 +179,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 7c16ec997..4266a87fe 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index c4a55c6a1..2665faa6c 100644 +index c4a55c6a1f..2665faa6c5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -68,6 +68,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch index 6d6d6d690f..d48086a969 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -1,4 +1,4 @@ -From dd9bce188d61c465ad634806702418c5a6347418 Mon Sep 17 00:00:00 2001 +From db5b2b692a6b6ca59d07f50beca322e56c5ee3dc Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads @@ -32,5 +32,5 @@ index 210c10b317..2ad3acf43b 100644 return true; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index 0761461fbc..9f72df2673 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From 66294924c12de6f6629939c1f80582f443480e83 Mon Sep 17 00:00:00 2001 +From f9b732ac79ee53385cc92bf38ea541f45a7c304c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5788ec6f6..5ff06d247 100644 +index 20990cbfdd..a80acbb6a5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1124,10 +1124,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -35,5 +35,5 @@ index 5788ec6f6..5ff06d247 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index 106fa7074f..862f9a5826 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 22047d54062fe5f973526c035e3a8ed652aba5e8 Mon Sep 17 00:00:00 2001 +From 12c382750154c7f56762076b755c2c1b122fc188 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c2bb79fe8..4f9c97a08 100644 +index 3a83819d56..c2061e9596 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -109,6 +109,21 @@ public abstract class PlayerList { @@ -32,5 +32,5 @@ index c2bb79fe8..4f9c97a08 100644 entityplayer.playerInteractManager.a((WorldServer) entityplayer.world); String s1 = "local"; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch index 8e718889d0..eb1688fc8a 100644 --- a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch +++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch @@ -1,4 +1,4 @@ -From d1f74537965b0b0d5e0ddd63e619874823c424ce Mon Sep 17 00:00:00 2001 +From 89cdf80156325f331b71f544198fa7be8cb71d8d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Configurable Disabling Cat Chest Detection @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection Offers a gameplay feature to stop cats from blocking chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4266a87fe..4641eaf2f 100644 +index 4266a87fe3..4641eaf2f8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -184,4 +184,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 4266a87fe..4641eaf2f 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 5e1a3df2b..e94786138 100644 +index 5e1a3df2b3..e94786138e 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -232,6 +232,11 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC diff --git a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch index ecb1dafc4e..4e011efaed 100644 --- a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,11 +1,11 @@ -From 9b67bd34da01401d30a699411b346805a95c9078 Mon Sep 17 00:00:00 2001 +From 6aa2b20662a0a6df004590d4434b3b20490ff225 Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4641eaf2f..05d2d50e5 100644 +index 4641eaf2f8..05d2d50e54 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -189,4 +189,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 4641eaf2f..05d2d50e5 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index aa23cdff1..f92bf02b8 100644 +index aa23cdff12..f92bf02b87 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -267,7 +267,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { diff --git a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch index f105ec2ca5..a199148d71 100644 --- a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch +++ b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch @@ -1,4 +1,4 @@ -From fa93c46b38c46ec16ff9bcf510e7f1dc6b56ef68 Mon Sep 17 00:00:00 2001 +From b72883726c3c140cd0459d8241c7e6c03873bab0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:02:07 -0600 Subject: [PATCH] Optimize Pathfinding @@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as arrow attacks. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 2d788ef66..60b5068e3 100644 +index 2d788ef663..60b5068e32 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -122,10 +122,26 @@ public abstract class NavigationAbstract { @@ -47,5 +47,5 @@ index 2d788ef66..60b5068e3 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch index cdaa718b95..b6a684bb5f 100644 --- a/Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 06645204746e6de3a180b5ae5c68b24645b7ba54 Mon Sep 17 00:00:00 2001 +From 04b4cf7404c1f7d9375bfc892904c172847f5372 Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items diff --git a/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch index 0b7be69d42..b29ed8c1bc 100644 --- a/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 8c43b6ed6b6fac6a56a6247e223098ee14f3564c Mon Sep 17 00:00:00 2001 +From 275f3eef9f154b760b5b1a5284f704fff1f4694c Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c6e6ae4fe..19fef2496 100644 +index c6e6ae4fe7..19fef2496e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1643,6 +1643,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch index efab2dad49..c1e7a04e7e 100644 --- a/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,11 +1,11 @@ -From a0fddd38b399a7b288f85bc375efd45262aa71fb Mon Sep 17 00:00:00 2001 +From 03ecaeca914d17d06f7a507ffbccba95a17d5c6f Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 3a15b47dd..5f14fb850 100644 +index 3a15b47dd6..5f14fb8501 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -100,7 +100,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -21,5 +21,5 @@ index 3a15b47dd..5f14fb850 100644 getHandle().setHealth((float) health); -- -2.19.1 +2.21.0 diff --git a/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch index 1dc8f4f1ec..0332d3e776 100644 --- a/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 3cfda1e5d4c4a1625fbbb8448dbd6f8e0b7215a7 Mon Sep 17 00:00:00 2001 +From 6648715ea2f2eec29832094e11db75f068948fc0 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -51,7 +51,7 @@ index 7b18c16402..15d62cf066 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cbfc84182b..3627b7dc6b 100644 +index 5496fae409..b8400876e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -159,5 +159,5 @@ index cbfc84182b..3627b7dc6b 100644 public String getDisplayName() { return getHandle().displayName; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch index dc69f693e1..28ab9cd977 100644 --- a/Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From 57db0c39f7754d65592693b68263e83dbd7e6846 Mon Sep 17 00:00:00 2001 +From 645bb0bb0df195ec9f1eb576f86119b6eb3e4012 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index 0ae0b5ed82..1573c05594 100644 +index b06f229534..2f0f667ad6 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -139,7 +139,7 @@ public abstract class Container { @@ -18,5 +18,5 @@ index 0ae0b5ed82..1573c05594 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) { -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch index 5ee6507506..7fa8543253 100644 --- a/Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From a16143b109a5099f59c969c98ed7299fbf4cf84c Mon Sep 17 00:00:00 2001 +From 67da8daf252ff15052efa583fc83015bf3756291 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list diff --git a/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch index 9b66d6b700..fac523a366 100644 --- a/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch @@ -1,11 +1,11 @@ -From 943089e6e5db3579fee6d6cd09d4e3f45badf674 Mon Sep 17 00:00:00 2001 +From e268b8b3e6cbcbb37ebcd90d00a8d2c99c1394ed Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 05d2d50e5..313712878 100644 +index 05d2d50e54..3137128780 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -194,4 +194,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 05d2d50e5..313712878 100644 + } } diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index b911d830a..aca407142 100644 +index b911d830a0..aca4071420 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -13,7 +13,7 @@ import org.bukkit.util.Vector; @@ -41,7 +41,7 @@ index b911d830a..aca407142 100644 return false; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java -index d4639c822..e1eb3aa0f 100644 +index d4639c8221..e1eb3aa0f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java @@ -12,7 +12,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent { diff --git a/Spigot-Server-Patches/0054-Add-velocity-warnings.patch b/Spigot-Server-Patches/0054-Add-velocity-warnings.patch index 039339dba3..9fc80d5f14 100644 --- a/Spigot-Server-Patches/0054-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0054-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 1fed3dbe8acea82704388f970d3636db9e67234f Mon Sep 17 00:00:00 2001 +From 85717e8f26f10adcd7edff6d7eb6af12f850e5ac Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a92546478..e723ba414 100644 +index 19fef2496e..54864fe761 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -201,6 +201,7 @@ public final class CraftServer implements Server { @@ -17,7 +17,7 @@ index a92546478..e723ba414 100644 private final class BooleanWrapper { private boolean value = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 660e59ba1..466750f77 100644 +index 660e59ba15..466750f779 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -266,12 +266,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -66,7 +66,7 @@ index 660e59ba1..466750f77 100644 public double getHeight() { return getHandle().length; diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 8e32c4e2c..c080a6118 100644 +index 8e32c4e2cd..c080a61185 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -76,7 +76,19 @@ public class WatchdogThread extends Thread diff --git a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch index 071bad28fd..d7eacf7dd4 100644 --- a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From c921194576a702ea41d47779f04f9c45524938d7 Mon Sep 17 00:00:00 2001 +From 7df97e1da4f97dcc72060dcede1d6ae5af0b9e03 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Configurable inter-world teleportation safety @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 313712878..40b54191e 100644 +index 3137128780..40b54191e6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -199,4 +199,9 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 313712878..40b54191e 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b8400876e..237210cc8 100644 +index b8400876e5..237210cc89 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -717,7 +717,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch index 300e6a5749..439fcb92ea 100644 --- a/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 0f1c8615e262b38dcdde638ce67cf87eaa8175bb Mon Sep 17 00:00:00 2001 +From db3e4015bc83abf1027c05c559d97961b7855218 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event diff --git a/Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index 6ce1eeb4cd..d6330b5a4b 100644 --- a/Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From 366c331315abcf82654e47d3faf4e192d5422e87 Mon Sep 17 00:00:00 2001 +From eca375524913b4560c8084481d44c4f819cdca13 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -26,5 +26,5 @@ index 28a2628350..eba6aadad7 100644 packetdataserializer.a(this.a); } -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch index 225a03e57e..d2856489c3 100644 --- a/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From c3260d4f2c1b5ac0248ce1533cec3b2a6a74e550 Mon Sep 17 00:00:00 2001 +From 9ec1a2698aee9535ee3990f479b4a66dcee686cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 40b54191e..06417c825 100644 +index 40b54191e6..06417c8250 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -204,4 +204,9 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index 40b54191e..06417c825 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6804b7274..86ea3f518 100644 +index ad30cdd824..c7f83d4343 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index 6804b7274..86ea3f518 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c5cc0b471..0ba15fce6 100644 +index c5cc0b471b..0ba15fce63 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -538,6 +538,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 28d45d1fb7..238cccefe1 100644 --- a/Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From 3fd318b20b1379f453d1befc6cec20ba093dfcda Mon Sep 17 00:00:00 2001 +From 6ed6c06f48ff7c4a5a206dccd1ef433b8bbdd2ad Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 5f14fb850..716eda990 100644 +index 5f14fb8501..716eda9902 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -537,4 +537,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -26,5 +26,5 @@ index 5f14fb850..716eda990 100644 + // Paper end } -- -2.19.1 +2.21.0 diff --git a/Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch index 44b16e5f0b..ff4cd129a7 100644 --- a/Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch +++ b/Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch @@ -1,4 +1,4 @@ -From 2eb12d8fcb6b1715e3583e9b3333f5032a7b240d Mon Sep 17 00:00:00 2001 +From 208077ba7ae7f41d3bdfcc4f5bc577faa8095905 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Mar 2016 18:18:37 -0600 Subject: [PATCH] Chunk save queue improvements @@ -26,7 +26,7 @@ Then finally, Sleeping will by default be removed, but due to known issues with But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index cc69ff3a4..f80b385ff 100644 +index cfcc244672..4e932ea235 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -217,4 +217,10 @@ public class PaperConfig { @@ -41,7 +41,7 @@ index cc69ff3a4..f80b385ff 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index b0c004b1f..d2cece265 100644 +index b0c004b1f2..d2cece2651 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -20,6 +20,7 @@ public class ChunkCoordIntPair { @@ -53,7 +53,7 @@ index b0c004b1f..d2cece265 100644 return a(this.x, this.z); } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 35976a26f..21ee154a5 100644 +index 35976a26f3..21ee154a57 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -20,6 +20,7 @@ import java.util.Map.Entry; @@ -172,7 +172,7 @@ index 35976a26f..21ee154a5 100644 NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) dataoutputstream); dataoutputstream.close(); diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java -index 8c3537ab8..3c688f546 100644 +index 8c3537ab8d..3c688f546c 100644 --- a/src/main/java/net/minecraft/server/FileIOThread.java +++ b/src/main/java/net/minecraft/server/FileIOThread.java @@ -38,20 +38,21 @@ public class FileIOThread implements Runnable { @@ -202,5 +202,5 @@ index 8c3537ab8..3c688f546 100644 if (this.c.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch index 591975e7fb..11e2efa311 100644 --- a/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From 3e2785e893872375e49c0565c801df502bc1a616 Mon Sep 17 00:00:00 2001 +From c1b75aa5e3a7cdc24024773406bb873d6e33943f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -54,5 +54,5 @@ index e507a996f1..5dbd1d517a 100644 public static synchronized boolean chunkExists(File file, int i, int j) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch index a73ad75942..75a6f9d9ce 100644 --- a/Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From aa5a3b7de9a8702cf53c25af2d4506a45799ec8a Mon Sep 17 00:00:00 2001 +From 7272a07d2a6c2b85366e6b9d769a3ae244a5f1d4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6b3556c13c..508327841d 100644 +index 4e932ea235..e4ba7146d1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -223,4 +223,9 @@ public class PaperConfig { @@ -30,7 +30,7 @@ index 6b3556c13c..508327841d 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e723ba414c..c592888ee5 100644 +index 54864fe761..6f2d74cf1c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -342,6 +342,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index e723ba414c..c592888ee5 100644 syncCommands(); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch index 22cc6811c6..1100b7fdb8 100644 --- a/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 0b09c08d67705f2504a959cff57cf26182bd198a Mon Sep 17 00:00:00 2001 +From d4818b38c5161ad66b8d3ffc6c3e38a8a22d40e4 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6f2d74cf1..c291bceed 100644 +index 6f2d74cf1c..c291bceedd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2093,5 +2093,23 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch index 662ca8a2e6..34b1f0a851 100644 --- a/Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From cbedcec343621db663f87db9845e8bcfdcf1550e Mon Sep 17 00:00:00 2001 +From 2fab64d6e4e209edbcfc14e8c325890bfa935caf Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b911220e7..8f31492cb 100644 +index c291bceedd..5e821b84d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -799,8 +799,18 @@ public final class CraftServer implements Server { @@ -30,5 +30,5 @@ index b911220e7..8f31492cb 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0066-Undead-horse-leashing.patch b/Spigot-Server-Patches/0066-Undead-horse-leashing.patch index b306d6700a..4aebda00b4 100644 --- a/Spigot-Server-Patches/0066-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0066-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 93e3d5e47501589140e29792fdd123027b3f8921 Mon Sep 17 00:00:00 2001 +From 5c09f39b2cf1a6c4c976c3902ac4ed220e99b893 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -6,7 +6,7 @@ Subject: [PATCH] Undead horse leashing default false to match vanilla, but option to allow undead horse types to be leashed. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 06417c825..66243835a 100644 +index 06417c8250..66243835a5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -209,4 +209,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 06417c825..66243835a 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index fc89cc89a..953277631 100644 +index fc89cc89a4..953277631a 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -113,7 +113,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven diff --git a/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch index ed561ca5a8..dd0f1129d1 100644 --- a/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 25571b96ef3f25aed15ba39f10aaa8d012538cdf Mon Sep 17 00:00:00 2001 +From 95f17033a7ed30132e1486f3b5b456dfe42e24cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 66243835a..803e68089 100644 +index 66243835a5..803e680894 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -214,4 +214,19 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 66243835a..803e68089 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index e8ce99eb9..feafb82dd 100644 +index e8ce99eb96..feafb82dd3 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -261,7 +261,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0069-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0069-Add-World-Util-Methods.patch index 927cf74d8b..1d375dadaf 100644 --- a/Spigot-Server-Patches/0069-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0069-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From e2a551344ce5dcc96e50b8aaeb3ff58ab247b2ac Mon Sep 17 00:00:00 2001 +From b1d5dfc632f2a84e5332754114d2a2ba0a866578 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 446e464b7..dcb036f31 100644 +index 67cd4af4f5..3f9de7e55a 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -637,6 +637,7 @@ public class Chunk implements IChunkAccess { @@ -18,7 +18,7 @@ index 446e464b7..dcb036f31 100644 return this.a(blockposition, i, this.world.o().g()); } diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java -index 237a34082..cf53118cc 100644 +index 646c5a91b8..554825ec1f 100644 --- a/src/main/java/net/minecraft/server/IWorldReader.java +++ b/src/main/java/net/minecraft/server/IWorldReader.java @@ -38,6 +38,22 @@ public interface IWorldReader extends IBlockAccess { @@ -45,7 +45,7 @@ index 237a34082..cf53118cc 100644 boolean isChunkLoaded(int i, int j, boolean flag); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0684d85be..7e35cc36b 100644 +index 6e7c0c9da4..fd45090685 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -79,7 +79,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -142,5 +142,5 @@ index 0684d85be..7e35cc36b 100644 return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch index 3880b4bf97..17ae006bf7 100644 --- a/Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch +++ b/Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch @@ -1,4 +1,4 @@ -From e2b8529488cc7210a1bbf066ee0ea303a60070b7 Mon Sep 17 00:00:00 2001 +From 62de9801d97be7f583f88f20b374660bb4349cc8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 21:22:56 -0400 Subject: [PATCH] Optimized Light Level Comparisons @@ -86,5 +86,5 @@ index 002be7f7be..7a943a6c27 100644 if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a_(entityzombie, entityzombie.getBoundingBox()) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()) && !this.world.containsLiquid(entityzombie.getBoundingBox())) { this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch index 9751018331..d601e351ab 100644 --- a/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch +++ b/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch @@ -1,4 +1,4 @@ -From 330e204a245962e81e507e22bdc85b1e0abd4498 Mon Sep 17 00:00:00 2001 +From b61f0153ccd138435700cfb4c711f477112574f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 19 Mar 2016 15:16:54 -0400 Subject: [PATCH] Pass world to Village creation @@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation fixes NPE bug #95 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java -index 98c6bbc18..7a9fb9753 100644 +index 98c6bbc183..7a9fb97530 100644 --- a/src/main/java/net/minecraft/server/PersistentVillage.java +++ b/src/main/java/net/minecraft/server/PersistentVillage.java @@ -237,7 +237,7 @@ public class PersistentVillage extends PersistentBase { @@ -19,7 +19,7 @@ index 98c6bbc18..7a9fb9753 100644 village.a(nbttagcompound1); this.villages.add(village); diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java -index 22b9cce4b..c99d4debc 100644 +index 68ad7bc213..b794572915 100644 --- a/src/main/java/net/minecraft/server/Village.java +++ b/src/main/java/net/minecraft/server/Village.java @@ -24,7 +24,7 @@ public class Village { @@ -32,5 +32,5 @@ index 22b9cce4b..c99d4debc 100644 this.d = BlockPosition.ZERO; this.j = Maps.newHashMap(); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch index 609a797962..563d899a60 100644 --- a/Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From 6e920c1db82cb6d65b371a79e058ce677075873f Mon Sep 17 00:00:00 2001 +From c48af2c45b56bb77f6f7d8ff7286e3edb2100c71 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f94badc76..2357cfbd6 100644 +index 0ba15fce63..a12cc1e92f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2600,12 +2600,13 @@ public abstract class EntityLiving extends Entity { @@ -45,5 +45,5 @@ index f94badc76..2357cfbd6 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 9162b7c973..b5d0a9a017 100644 --- a/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From d5f356741088cf998212fb5f162161fd49a60ce8 Mon Sep 17 00:00:00 2001 +From 36bbdf4c9c7c6b8cb7e51c4bb264c0d041c0ca62 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a12cc1e92..2454083b2 100644 +index a12cc1e92f..2454083b2d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity { @@ -44,7 +44,7 @@ index a12cc1e92..2454083b2 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5b9f2dd4a..d0f8ad0b6 100644 +index 5b9f2dd4a6..d0f8ad0b69 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1537,6 +1537,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch index 59bb6f8c3b..62247d4fb4 100644 --- a/Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch +++ b/Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch @@ -1,11 +1,11 @@ -From aa830a52fc2ed826f6421df2fc5817a2c4a36a90 Mon Sep 17 00:00:00 2001 +From 513795a62119bbb58aa92ca9d1028cc8c07b4850 Mon Sep 17 00:00:00 2001 From: Daniel Ennis Date: Sun, 20 Mar 2016 15:22:42 -0400 Subject: [PATCH] Catch Async PlayerChunkMap operations diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 55161af9c..206457650 100644 +index 55161af9c9..2064576501 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -434,10 +434,12 @@ public class PlayerChunkMap { @@ -22,5 +22,5 @@ index 55161af9c..206457650 100644 long i = d(chunkcoordintpair.x, chunkcoordintpair.z); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0075-Waving-banner-workaround.patch b/Spigot-Server-Patches/0075-Waving-banner-workaround.patch index 584c5c41e7..42b4f82282 100644 --- a/Spigot-Server-Patches/0075-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0075-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From 5e1586ef520f83dbf2bc8edb333f9939c8115409 Mon Sep 17 00:00:00 2001 +From 86123fbf9b9faa759b1e7434b45c4989462fbe53 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround This patch is a workaround for MC-63720 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index c5c3f40ce..6413f76e7 100644 +index c5c3f40ce0..6413f76e78 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -4,7 +4,13 @@ import java.io.IOException; @@ -34,5 +34,5 @@ index c5c3f40ce..6413f76e7 100644 public void a(PacketDataSerializer packetdataserializer) throws IOException { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch index 45302c3515..bbaa1d4c28 100644 --- a/Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 8eff43ace31acf510f77d2fe38e77627e29c1d08 Mon Sep 17 00:00:00 2001 +From be2cfdf1b97735d405aa7f13d4507e4c9f4fbd29 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index dfb7d544f..ab46ae8c3 100644 +index c7f83d4343..cbbb243d1c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -49,6 +49,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,5 +40,5 @@ index dfb7d544f..ab46ae8c3 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch index 6912f02f3d..3fd3814829 100644 --- a/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From 9204f21b38dd0ddebe4bf14a00cf2b708b9544a3 Mon Sep 17 00:00:00 2001 +From 232f2c9e71828f540e69196dee974ef5f5e2ba07 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3584161c4..01d88ce66 100644 +index cbbb243d1c..dba97f2305 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2579,7 +2579,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch index f411777afe..0fac66c023 100644 --- a/Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From ce3c5c8ec8d6bf991d2d9231bf949ea2157e1f65 Mon Sep 17 00:00:00 2001 +From 11ab12d6efda726da59ca55d164a9ba49af71e59 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT Optimize this look up by using a Last Access cache. diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java -index 732c8793e..8b3738c8f 100644 +index 732c8793e5..8b3738c8f7 100644 --- a/src/main/java/net/minecraft/server/ChunkMap.java +++ b/src/main/java/net/minecraft/server/ChunkMap.java @@ -15,6 +15,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap { @@ -71,7 +71,7 @@ index 732c8793e..8b3738c8f 100644 public Chunk remove(Object object) { return this.remove((Long) object); diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 1ed7c7e2c..c54df4583 100644 +index 1ed7c7e2c9..c54df45837 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -76,15 +76,16 @@ public class ChunkProviderServer implements IChunkProvider { @@ -121,5 +121,5 @@ index 1ed7c7e2c..c54df4583 100644 } } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch index ed07f8bad1..4f923b7930 100644 --- a/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,11 +1,11 @@ -From 270807a1f8c7638d0a365fee70ece496a2c64869 Mon Sep 17 00:00:00 2001 +From e1625b6c8dfcb3cb82f0e3a14397ce35eb32d94d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 803e68089..be380ac75 100644 +index 803e680894..be380ac75e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -229,4 +229,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 803e68089..be380ac75 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ed6f3afcf..aaeb888a8 100644 +index ed6f3afcfe..aaeb888a8c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -480,7 +480,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 3f985bdd7d..a76902e848 100644 --- a/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From e97a654e918381c5b2eb07cf6d632fb55c457fa6 Mon Sep 17 00:00:00 2001 +From f379dcca9c38349b82a318227aee76c6c3c98869 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling diff --git a/Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch index 6229aabfec..f836513244 100644 --- a/Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From 328a66aaf0b160765b9bb444a220a78a3cc9ca06 Mon Sep 17 00:00:00 2001 +From b0f6b1e28395bcdd423bd2754a630bd1e23ddb29 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot @@ -64,5 +64,5 @@ index 2273f213cb..60446f2478 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index ce65f937de..3b0d25d09e 100644 --- a/Spigot-Server-Patches/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -1,4 +1,4 @@ -From 06f64c95ff6f0e07d8fffa60b551ecf7e32700a1 Mon Sep 17 00:00:00 2001 +From 4f6a8c94bfaf64e35e966ccd46185741f79b021d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener @@ -44,7 +44,7 @@ index f488c37f73..ee45d3705b 100644 if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit this.methodProfiler.a(() -> { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b398dd1b57..87ea698eec 100644 +index f4e91db7c6..f94633cbe2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -486,7 +486,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch index 5e1ae7b4f6..297b052698 100644 --- a/Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From 39105c3c741bdead79bb7b8a21e38b3980e48017 Mon Sep 17 00:00:00 2001 +From e04fc8c3d54d686f2894b0b273b8bdfbf47beaa1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 541d9c2d6..5b36e7590 100644 +index f94633cbe2..9371d83f1d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1032,6 +1032,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -25,5 +25,5 @@ index 541d9c2d6..5b36e7590 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch index bdf4c4ca4a..b104ac0e8e 100644 --- a/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch +++ b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch @@ -1,4 +1,4 @@ -From 77d354aa2dbabcd0cdbeb77d8063789978bdf230 Mon Sep 17 00:00:00 2001 +From 30cce2c18fb76855ddad062f12072ce436e8ecc2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time @@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu This allows to fine-tune vanilla gameplay. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index be380ac75..69ac43d9a 100644 +index be380ac75e..69ac43d9a9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -237,4 +237,19 @@ public class PaperWorldConfig { @@ -35,7 +35,7 @@ index be380ac75..69ac43d9a 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 182a637ad..0421f8f95 100644 +index b76c1579ea..c74176daa5 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1289,7 +1289,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0085-EntityPathfindEvent.patch b/Spigot-Server-Patches/0085-EntityPathfindEvent.patch index c857098d68..030a3ea1d6 100644 --- a/Spigot-Server-Patches/0085-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0085-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From f8da455661efa320cd90dd6a41195b8a0c29bc3e Mon Sep 17 00:00:00 2001 +From 532ad87eb21f8762a38eb0c56dae2e31f292ed22 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 60b5068e3..604049b08 100644 +index 60b5068e32..604049b088 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch index 5462530b44..8a160d7089 100644 --- a/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,4 +1,4 @@ -From 6411f52ac4ce53d7de71028c657dfc2e6b89e001 Mon Sep 17 00:00:00 2001 +From a05120f07988e9b44ec31b64d116eecdf159d664 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 06:56:23 +0300 Subject: [PATCH] Reduce IO ops opening a new region file. @@ -37,5 +37,5 @@ index 9626396745..e2d4450e90 100644 } } catch (IOException ioexception) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch index 16df9e1f73..ff67826d51 100644 --- a/Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From f66ef986b6349909793d94ae5f6087a3eb8302c0 Mon Sep 17 00:00:00 2001 +From a1b78729ad268fc1bb764e0432ff606abb0f7f86 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 492df2c8e..0778f53e2 100644 +index e4ba7146d1..06c53af2c5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -228,4 +228,9 @@ public class PaperConfig { @@ -25,7 +25,7 @@ index 492df2c8e..0778f53e2 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 5dbd1d517..964996976 100644 +index 5dbd1d517a..964996976a 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -9,10 +9,12 @@ import java.io.IOException; @@ -75,5 +75,5 @@ index 5dbd1d517..964996976 100644 Iterator iterator = RegionFileCache.cache.values().iterator(); -- -2.20.0 +2.21.0 diff --git a/Spigot-Server-Patches/0088-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0088-Use-Optimized-Collections.patch index acae4d02e7..55d5ea4686 100644 --- a/Spigot-Server-Patches/0088-Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/0088-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From 1ab2476a22758ca4105962280dde11b9464b8966 Mon Sep 17 00:00:00 2001 +From 600f9aaa6a5333db0318c91f1ad30fc82092ba55 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections @@ -13,7 +13,7 @@ These collections are super fast as seen http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/ diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java -index 2b27ae7973..7191185ba7 100644 +index b8fd774956..51a02edf83 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -12,6 +12,7 @@ import java.util.Map; @@ -34,5 +34,5 @@ index 2b27ae7973..7191185ba7 100644 private boolean f = true; private boolean g; -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch index b78a2737cc..5b6bf35ba8 100644 --- a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch @@ -1,11 +1,11 @@ -From e243b9109433eae11aa5d0ba4c3aecb1fccf3976 Mon Sep 17 00:00:00 2001 +From 096033929413ea354e0b00c6433af4178b66dfdf Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 49533ac33..eef3ab73f 100644 +index 49533ac33e..eef3ab73fc 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -26,7 +26,7 @@ public class ChunkCache implements IIBlockAccess { @@ -18,7 +18,7 @@ index 49533ac33..eef3ab73f 100644 } diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 604049b08..716d00afb 100644 +index 604049b088..716d00afb1 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -22,8 +22,9 @@ public abstract class NavigationAbstract { @@ -49,7 +49,7 @@ index 604049b08..716d00afb 100644 if (this.m) { this.l(); diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 3085338f0..89d51d471 100644 +index 3085338f0a..89d51d471a 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -9,7 +9,7 @@ public class Pathfinder { @@ -62,7 +62,7 @@ index 3085338f0..89d51d471 100644 public Pathfinder(PathfinderAbstract pathfinderabstract) { this.d = pathfinderabstract; diff --git a/src/main/java/net/minecraft/server/PathfinderAbstract.java b/src/main/java/net/minecraft/server/PathfinderAbstract.java -index 36d7e1d96..d722c8513 100644 +index 36d7e1d966..d722c85139 100644 --- a/src/main/java/net/minecraft/server/PathfinderAbstract.java +++ b/src/main/java/net/minecraft/server/PathfinderAbstract.java @@ -4,6 +4,7 @@ public abstract class PathfinderAbstract { @@ -82,7 +82,7 @@ index 36d7e1d96..d722c8513 100644 this.c.c(); this.d = MathHelper.d(entityinsentient.width + 1.0F); diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index eec891647..e45bdb581 100644 +index eec8916479..e45bdb581e 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -327,7 +327,8 @@ public class PathfinderNormal extends PathfinderAbstract { diff --git a/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch index 37f833362e..5bd0521718 100644 --- a/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From fe617230001f60f90d1511e6673e91fa51b54f00 Mon Sep 17 00:00:00 2001 +From c8b443afca617ae27d8b784a48c4817933d7e3e3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for light checks @@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5b36e7590..f4b5e3ba4 100644 +index 9371d83f1d..34b5ca3a7e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -663,6 +663,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -19,5 +19,5 @@ index 5b36e7590..f4b5e3ba4 100644 return this.getChunkAtWorldCoords(blockposition).a(blockposition, i); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch index 3856d4ac21..877ce9e522 100644 --- a/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From 3a7b47e95a8f85b41b95c1d0521390ab564fbf8f Mon Sep 17 00:00:00 2001 +From 834922853fbfd37864ba9ceb6898e2628c9ec553 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 4f9c97a08..13d55343e 100644 +index c2061e9596..6e62ea90dd 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -161,6 +161,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index 4f9c97a08..13d55343e 100644 entityplayer.getStatisticManager().c(); entityplayer.B().a(entityplayer); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch index 068c177278..a3993da9a9 100644 --- a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,11 +1,11 @@ -From 55159254602789dd514a44b22bd38ef503ce4ae2 Mon Sep 17 00:00:00 2001 +From d7cd2aa94ac35ab602e58484a14ae747b2a68240 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 69ac43d9a..6b74f810a 100644 +index 69ac43d9a9..6b74f810a9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -252,4 +252,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 69ac43d9a..6b74f810a 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java -index da6182deb..f1174825c 100644 +index da6182deb1..f1174825c2 100644 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java @@ -21,6 +21,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow { diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch index bb86e832ef..368464af82 100644 --- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From f4e4fe03783d2f79376e0dfb9254d398d1635a2f Mon Sep 17 00:00:00 2001 +From a56f7a9e0398151c9e09484f4b932f748bb637b0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6b74f810a..260c55016 100644 +index 6b74f810a9..260c55016e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -258,4 +258,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 6b74f810a..260c55016 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ee45d3705..01c5d3c57 100644 +index ee45d3705b..01c5d3c572 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -486,13 +486,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -63,7 +63,7 @@ index ee45d3705..01c5d3c57 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 34b5ca3a7..8a445a1fa 100644 +index 34b5ca3a7e..8a445a1fa3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2853,8 +2853,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -78,7 +78,7 @@ index 34b5ca3a7..8a445a1fa 100644 public LongSet ag() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5e821b84d..b0ae0365e 100644 +index 5e821b84d6..b0ae0365e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1007,7 +1007,7 @@ public final class CraftServer implements Server { @@ -91,7 +91,7 @@ index 5e821b84d..b0ae0365e 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 262c3f910..a8c7e7931 100644 +index 262c3f910e..a8c7e7931e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1419,8 +1419,9 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index c2372abc69..da3adc1c3f 100644 --- a/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 1c7840b8ff0e9e11c68d3decf34a047ee2fa3497 Mon Sep 17 00:00:00 2001 +From 3a2173955a650e1613573c58df97db088d0326cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2ed87dd9c..937fd74b1 100644 +index 8a445a1fa3..b595536648 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -578,6 +578,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -17,5 +17,5 @@ index 2ed87dd9c..937fd74b1 100644 this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index 8d75ee07a0..382b025f1e 100644 --- a/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,4 +1,4 @@ -From e967f3bcc7b0a00d5282d2a2d5976e1e48107238 Mon Sep 17 00:00:00 2001 +From 2c462895126242c15395ff2033688c432492ad50 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 19:42:22 -0400 Subject: [PATCH] Don't spam reload spawn chunks in nether/end diff --git a/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch index 04c4d2b0ff..ad85c877b5 100644 --- a/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 2445bd51a7e8e1e29d2ed54a71136d45e2bf9685 Mon Sep 17 00:00:00 2001 +From 370c0f9263d280138a073b0237be9e2cc72f6fd1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits @@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 9e83610f1..fe5947b6c 100644 +index 9e83610f1a..fe5947b6cc 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -14,7 +14,7 @@ public class DataBits { @@ -42,5 +42,5 @@ index 9e83610f1..fe5947b6c 100644 int k = j / 64; int l = ((i + 1) * this.b - 1) / 64; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch index b612a76f0c..e527c055fd 100644 --- a/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 61bdfa719486008ab22f8a9efa127db9fa5dbc76 Mon Sep 17 00:00:00 2001 +From 0ca415c498a9f0a63caa664b5951e4028326b7f5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d0f8ad0b6..ff9c2c04f 100644 +index d0f8ad0b69..ff9c2c04f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -727,6 +727,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch index 2dd3a0811a..c26c9f2dc7 100644 --- a/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 509bc747e1d9431854cb6956c0fc1d1c95e072ed Mon Sep 17 00:00:00 2001 +From 27fffdd001e9462d4701d1011de790f8b6478872 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List diff --git a/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch index aa3f9b27b7..2b682de2bf 100644 --- a/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch @@ -1,11 +1,11 @@ -From b71c6bf65574ea7877e1293d8fdf950947ec0507 Mon Sep 17 00:00:00 2001 +From 62ab4dea592870baed4e544e72552489e5b715d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 3a54ebdb15..e59f3c21d7 100644 +index 48fbcf863d..79c24cdc4c 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback; @@ -18,5 +18,5 @@ index 3a54ebdb15..e59f3c21d7 100644 private GameProfile a; private int e; -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch index 083cbcaeea..6d79a58f14 100644 --- a/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From 52851c88a5df872998f8f90dbe63f63e0fc9d504 Mon Sep 17 00:00:00 2001 +From bb1c1ab4db447251965dbd0e053506855d523a6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 0778f53e2..30fcf4a72 100644 +index 06c53af2c5..b0bfdf9424 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -233,4 +233,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index 0778f53e2..30fcf4a72 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e53e25626..6841fc2bd 100644 +index 01c5d3c572..b87520d834 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -421,6 +421,19 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -43,7 +43,7 @@ index e53e25626..6841fc2bd 100644 protected void a(File file, WorldData worlddata) { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java -index a6aed2531..575e3762b 100644 +index a6aed2531f..575e3762b2 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java @@ -94,7 +94,7 @@ public class PacketPlayOutScoreboardTeam implements Packet Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 8f2289f4e..93ca93b64 100644 +index 8f2289f4ea..93ca93b640 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -45,5 +45,5 @@ index 8f2289f4e..93ca93b64 100644 if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; -- -2.20.0 +2.21.0 diff --git a/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch index 101e60e79f..9dd8e6828d 100644 --- a/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From b29545cb2306aec2113260e8574a89cd053a7d5d Mon Sep 17 00:00:00 2001 +From faa24a31538552e4bf1ee189e86a98c49798bb93 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address For servers with multiple IP's, ability to bind to a specific interface. diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java -index 81a6a8fc9..7b82c4dea 100644 +index 81a6a8fc9e..7b82c4dea2 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -24,7 +24,7 @@ public class RemoteControlListener extends RemoteConnectionThread { @@ -19,5 +19,5 @@ index 81a6a8fc9..7b82c4dea 100644 if (0 == this.h) { this.h = this.i + 10; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch index 7b46248fb9..d9a1d5b92b 100644 --- a/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From f7bd4a38ff79dfc78488a4348bfbc4f85eb92a9f Mon Sep 17 00:00:00 2001 +From b44e245e5b5a0dcedd1d41c27db96130b929ead7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks @@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index e09a58697..3f421d46a 100644 +index e09a586977..3f421d46a0 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -161,6 +161,7 @@ public class BlockFire extends Block { @@ -49,5 +49,5 @@ index e09a58697..3f421d46a 100644 return i; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch index 3648ed4846..6dd5e4b21f 100644 --- a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From ee2f6ed876e06024c6daf383f58a4b4de68a357d Mon Sep 17 00:00:00 2001 +From bf7af916f9eb07cbe2f9a6e1d0c919a06bb99191 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2665faa6c..7ed9903a8 100644 +index 2665faa6c5..7ed9903a8c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -33,7 +33,7 @@ import org.bukkit.inventory.MainHand; @@ -40,7 +40,7 @@ index 2665faa6c..7ed9903a8 100644 this.ct = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bx, (byte) packetplayinsettings.f()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ff9c2c04f..59bfcce68 100644 +index ff9c2c04f3..59bfcce68d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1721,8 +1721,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch index 0861663475..453f9aa35e 100644 --- a/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 2bea46eadc94b15e1ccb5dbfe4c6ae78c33daf16 Mon Sep 17 00:00:00 2001 +From 3910692335aa74b78d0352cbc8736c6b8ebcb80f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d41a7fb087..4fe91b5a2f 100644 +index 2454083b2d..e8f2f11c4d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -873,10 +873,16 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 03dbd21ee8..aed3606bdc 100644 this.foodTickTimer = 0; } -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch index ddf49cb148..b2df4d5f1f 100644 --- a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,11 +1,11 @@ -From 05b1b8e004565cb788aff3ca7297dce8a582107b Mon Sep 17 00:00:00 2001 +From f72e611c6ce91816e01957a1b15a61e29e76b0a6 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 37cc057ab..52a6ff855 100644 +index 37cc057ab7..52a6ff8554 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -269,4 +269,14 @@ public class PaperWorldConfig { @@ -24,7 +24,7 @@ index 37cc057ab..52a6ff855 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index f99046b9b..2c881be1e 100644 +index f99046b9b6..2c881be1ed 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -12,6 +12,7 @@ public class BlockIceFrost extends BlockIce { diff --git a/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch index f34a1632f8..0c16a42ef4 100644 --- a/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 67dbf6e8151d0938692306062ad09bdc3fd830bc Mon Sep 17 00:00:00 2001 +From 29606f9f5c0510848c92ee9e704c086315c30074 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -36,5 +36,5 @@ index b87520d834..78b60d0e35 100644 // CraftBukkit end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 5ecd17560f..f4119acb8b 100644 --- a/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From c53420457dcd8f4e89e5e1ea371144ef7ecceec4 Mon Sep 17 00:00:00 2001 +From 46f6453e45b047a008d8cd5dd02ca0fcb1ba360d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index e97bb2305..5e5a747e9 100644 +index e97bb2305c..5e5a747e9f 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -615,6 +615,12 @@ public abstract class EntityHuman extends EntityLiving { @@ -30,7 +30,7 @@ index e97bb2305..5e5a747e9 100644 ItemStack itemstack1 = this.a(entityitem); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3e104a126..b287dbd91 100644 +index 04ec2a0399..32ee298648 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1072,6 +1072,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -42,7 +42,7 @@ index 3e104a126..b287dbd91 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java -index 5c09085a6..a819d6037 100644 +index 5c09085a6b..a819d60375 100644 --- a/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java @@ -30,6 +30,7 @@ public class WorldMap extends PersistentBase { @@ -114,7 +114,7 @@ index 5c09085a6..a819d6037 100644 for ( org.bukkit.map.MapCursor cursor : render.cursors) { diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java -index 256a13178..5768cd512 100644 +index 256a131781..5768cd512e 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor; diff --git a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch index 78545e8a90..4b4a9c85e8 100644 --- a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 3ab046e2a34ea4d6e6d88080954337985c19e1ca Mon Sep 17 00:00:00 2001 +From b5c5fe130ae42288c1b008a77039502bcd3b441c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players do not suffer with "Every chest has been looted" diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 52a6ff855..720b87a5e 100644 +index 52a6ff8554..720b87a5ec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -279,4 +279,26 @@ public class PaperWorldConfig { @@ -43,7 +43,7 @@ index 52a6ff855..720b87a5e 100644 } diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java new file mode 100644 -index 000000000..d6fce3112 +index 0000000000..d6fce3112e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java @@ -0,0 +1,33 @@ @@ -82,7 +82,7 @@ index 000000000..d6fce3112 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java new file mode 100644 -index 000000000..5e637782d +index 0000000000..5e637782d5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java @@ -0,0 +1,28 @@ @@ -116,7 +116,7 @@ index 000000000..5e637782d +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java new file mode 100644 -index 000000000..856843fc9 +index 0000000000..856843fc91 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java @@ -0,0 +1,71 @@ @@ -193,7 +193,7 @@ index 000000000..856843fc9 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java new file mode 100644 -index 000000000..b5401eaf9 +index 0000000000..b5401eaf97 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java @@ -0,0 +1,179 @@ @@ -378,7 +378,7 @@ index 000000000..b5401eaf9 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java new file mode 100644 -index 000000000..f9fbc221b +index 0000000000..f9fbc221bd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java @@ -0,0 +1,64 @@ @@ -448,7 +448,7 @@ index 000000000..f9fbc221b +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java new file mode 100644 -index 000000000..d50410532 +index 0000000000..d50410532c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java @@ -0,0 +1,67 @@ @@ -520,7 +520,7 @@ index 000000000..d50410532 + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 01d88ce66..6c7043023 100644 +index dba97f2305..c9b37727ff 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -532,7 +532,7 @@ index 01d88ce66..6c7043023 100644 public CraftEntity getBukkitEntity() { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index 520cca48c..e228fc853 100644 +index 520cca48cc..e228fc8538 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp @@ -591,7 +591,7 @@ index 520cca48c..e228fc853 100644 if (this.lootTableSeed == 0L) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index 961d9a5f9..60f0b5046 100644 +index 961d9a5f99..60f0b5046a 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -5,9 +5,10 @@ import javax.annotation.Nullable; @@ -647,7 +647,7 @@ index 961d9a5f9..60f0b5046 100644 if (this.h == 0L) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 8617fac6b..4f4121adc 100644 +index 8617fac6b0..4f4121adca 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -61,7 +61,7 @@ public class CraftBlockEntityState extends CraftBlockState @@ -660,7 +660,7 @@ index 8617fac6b..4f4121adc 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java -index fa03d17a4..14b5be75f 100644 +index fa03d17a4c..14b5be75f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -13,8 +13,9 @@ import org.bukkit.craftbukkit.CraftWorld; @@ -675,7 +675,7 @@ index fa03d17a4..14b5be75f 100644 public CraftChest(final Block block) { super(block, TileEntityChest.class); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -index 7ef68bb62..daf183fb1 100644 +index 7ef68bb626..daf183fb10 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java @@ -1,5 +1,6 @@ @@ -704,7 +704,7 @@ index 7ef68bb62..daf183fb1 100644 getSnapshot().setLootTable(key, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java -index 1b5b266c0..e0b99207b 100644 +index 1b5b266c05..e0b99207b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -1,5 +1,6 @@ @@ -724,7 +724,7 @@ index 1b5b266c0..e0b99207b 100644 public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -index 87303ecd1..6790fa2fe 100644 +index 87303ecd13..6790fa2fee 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo @@ -737,7 +737,7 @@ index 87303ecd1..6790fa2fe 100644 getHandle().a(newKey, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java -index f29365c94..1937f7b9a 100644 +index f29365c948..1937f7b9a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch index 4dbc8e5e6b..a45d7f6192 100644 --- a/Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch @@ -1,4 +1,4 @@ -From 2e18b9af25006981e797eb0e9a1347ab4abf5050 Mon Sep 17 00:00:00 2001 +From 6d6e37ba0e3e91d7a711bc05c53daeeb304b82f4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Jun 2013 01:24:00 -0400 Subject: [PATCH] Entity Tracking Improvements @@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player, send all passenger/vehicles to the player in the chain. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b6356966a..583cee415 100644 +index c9b37727ff..82994db643 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -70,6 +70,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -19,7 +19,7 @@ index b6356966a..583cee415 100644 if (bukkitEntity == null) { bukkitEntity = CraftEntity.getEntity(world.getServer(), this); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index b3aa57d19..2b8501143 100644 +index de0cf6b735..5629f9909b 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -56,6 +56,7 @@ public class EntityTrackerEntry { @@ -99,5 +99,5 @@ index b3aa57d19..2b8501143 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 0b190bae6c..3c83f6829b 100644 --- a/Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,11 +1,11 @@ -From 9c9c5f73303c7aeb25ee2ac573501c161a4ed6b6 Mon Sep 17 00:00:00 2001 +From c3a16fc0fb33437dd1096f445f7b2c2e15c78c16 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 30fcf4a72..e10055b7d 100644 +index b0bfdf9424..c6d2c30339 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -238,4 +238,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index 30fcf4a72..e10055b7d 100644 + } } diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java -index 1a9391a38..3a9dfb979 100644 +index 1a9391a382..3a9dfb9798 100644 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java @@ -177,6 +177,7 @@ public class PersistentScoreboard extends PersistentBase { @@ -31,5 +31,5 @@ index 1a9391a38..3a9dfb979 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch index 1d08f45990..72473fcd13 100644 --- a/Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From 69b58525c617618b2d24eb146c728d67a0ab680d Mon Sep 17 00:00:00 2001 +From c9943e056e9e489ad5907e5b2d7e99b1602550f7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 5d03191c80..ed5f46bf6f 100644 +index c080a61185..0117c3d3de 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -57,7 +57,7 @@ public class WatchdogThread extends Thread @@ -18,5 +18,5 @@ index 5d03191c80..ed5f46bf6f 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "------------------------------" ); -- -2.19.1 +2.21.0 diff --git a/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch index 8784a63bdf..39f155077a 100644 --- a/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 5ed6d63e100f8b293b5e2573bf2b6c5d595825bb Mon Sep 17 00:00:00 2001 +From 537b37247849b22c5058f77c9c5134fd7b25a5cf Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Activation Range Improvements @@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior Adds water Mobs to activation range config and nerfs fish diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index bc364ce37..80e13dfb2 100644 +index bc364ce371..80e13dfb2e 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -387,6 +387,7 @@ public class BlockPosition extends BaseBlockPosition { @@ -22,7 +22,7 @@ index bc364ce37..80e13dfb2 100644 return new BlockPosition(this); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a091f88bb..3e292c231 100644 +index 82994db643..462f94ed18 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -592,6 +592,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -34,7 +34,7 @@ index a091f88bb..3e292c231 100644 if (i != this.aM) { diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index 20b7c2c6d..d659c57db 100644 +index 20b7c2c6dc..d659c57dbe 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent; @@ -46,7 +46,7 @@ index 20b7c2c6d..d659c57db 100644 private float b; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index e5322de97..c53082459 100644 +index e5322de974..c530824596 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -105,6 +105,17 @@ public abstract class EntityInsentient extends EntityLiving { @@ -68,7 +68,7 @@ index e5322de97..c53082459 100644 return this.moveController; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e8f2f11c4..c0ef0c51f 100644 +index e8f2f11c4d..c0ef0c51f1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity { @@ -81,7 +81,7 @@ index e8f2f11c4..c0ef0c51f 100644 protected int ticksFarFromPlayer; protected float aZ; diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index b19bd2b99..5e1976871 100644 +index b19bd2b99a..5e19768710 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -93,7 +93,7 @@ index b19bd2b99..5e1976871 100644 return this.bQ != null; } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index a146a8b45..a19853463 100644 +index a146a8b459..a19853463c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -18,7 +18,10 @@ public abstract class PathfinderGoal { @@ -109,7 +109,7 @@ index a146a8b45..a19853463 100644 public void e() {} diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java -index d5c08aa7c..756d63239 100644 +index d5c08aa7cb..756d63239c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java @@ -2,12 +2,12 @@ package net.minecraft.server; @@ -150,7 +150,7 @@ index d5c08aa7c..756d63239 100644 } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index f3df91181..3e2f9c749 100644 +index f3df91181f..3e2f9c749b 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -11,10 +11,10 @@ public class PathfinderGoalSelector { @@ -189,7 +189,7 @@ index f3df91181..3e2f9c749 100644 Iterator iterator = this.b.iterator(); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 09df00e94..d08ef3fe1 100644 +index 09df00e94b..d08ef3fe10 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -2,6 +2,8 @@ package org.spigotmc; @@ -387,7 +387,7 @@ index 09df00e94..d08ef3fe1 100644 { isActive = false; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index d3c2abc39..1d222eaff 100644 +index d3c2abc398..1d222eaff7 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -150,12 +150,14 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch index 69248c7ede..e55ca7d5ed 100644 --- a/Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From b3c07afca7589a742cdd93a0af236002272be328 Mon Sep 17 00:00:00 2001 +From fad39d84f9fedb2d3b8d1484417472592904368e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d54a112e5..7e1711b2f 100644 +index 78b60d0e35..7ffb061414 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -687,7 +687,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -23,7 +23,7 @@ index d54a112e5..7e1711b2f 100644 // Spigot end } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index f782ecb82..65d230d45 100644 +index f782ecb82f..65d230d45f 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -108,7 +108,7 @@ public class UserCache { @@ -98,5 +98,5 @@ index f782ecb82..65d230d45 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch index b14a7d441d..2ec6daa6e2 100644 --- a/Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From 46e4b64e9955a014abcd9743dd0b22ebd872c2a6 Mon Sep 17 00:00:00 2001 +From aec8613d66d263badbe8bd4354198135d8b08cb8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation Per Paper issue 294 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 41ff55e9e..baabcd19c 100644 +index 41ff55e9e2..baabcd19c4 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -39,6 +39,15 @@ public class ServerConnection { @@ -43,5 +43,5 @@ index 41ff55e9e..baabcd19c 100644 if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch index 5c90de1246..f8570ebab4 100644 --- a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch @@ -1,11 +1,11 @@ -From 8c6bf6b19ba3fbbe21a1d98cec46c93bb9ca8f0d Mon Sep 17 00:00:00 2001 +From 63ff9250af978a4b43ee5463b0efd46a67e530eb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 720b87a5e..bcc2ecaa3 100644 +index 720b87a5ec..bcc2ecaa3a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,7 +2,6 @@ package com.destroystokyo.paper; @@ -32,7 +32,7 @@ index 720b87a5e..bcc2ecaa3 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3e292c231..31c53552f 100644 +index 462f94ed18..113264981e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1190,6 +1190,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -61,7 +61,7 @@ index 3e292c231..31c53552f 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 7f4b68dcc..7a8670323 100644 +index 7f4b68dcc0..7a8670323c 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -146,4 +146,49 @@ public class EntityTNTPrimed extends Entity { diff --git a/Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch index 70706eab1d..c40143a1cd 100644 --- a/Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From b0b8145ed696c7f8761e5f48077eba9429a4a6a1 Mon Sep 17 00:00:00 2001 +From 724e26451f8b6dedc7b7013fcbc0aded8efd85a7 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal Only resize the the redstone torch list once, since resizing arrays / lists is costly diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java -index 35abdee5e5..42cb2d47ca 100644 +index d8a0b73c31..74b63fe1d1 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -63,9 +63,17 @@ public class BlockRedstoneTorch extends BlockTorch { @@ -39,5 +39,5 @@ index 35abdee5e5..42cb2d47ca 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch index ccd3accd4b..d43e519a74 100644 --- a/Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch +++ b/Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch @@ -1,4 +1,4 @@ -From b6cdf80b0353a657001aa33a1bf91d7c3f4a3cde Mon Sep 17 00:00:00 2001 +From 036c518050a0972307568a014156d59bb90bf54c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 27 May 2016 21:41:26 -0400 Subject: [PATCH] Ensure Chunks never ever load async @@ -43,5 +43,5 @@ index 52a8c48fa4..4cfe24df15 100644 } try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage2.startTimingIfSync()) { // Paper -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0121-Add-server-name-parameter.patch b/Spigot-Server-Patches/0121-Add-server-name-parameter.patch index 982c69fb2f..54f7def9db 100644 --- a/Spigot-Server-Patches/0121-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0121-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From d44e4a028f3a138516a40480107df9594f91f41c Mon Sep 17 00:00:00 2001 +From 254da8d94b3a51da9dedea35952ab380fecdd3ad Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index bbd5766a23..b726fe947a 100644 +index c85a9bfb91..472a8070e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -136,6 +136,14 @@ public class Main { @@ -24,5 +24,5 @@ index bbd5766a23..b726fe947a 100644 }; -- -2.19.0 +2.21.0 diff --git a/Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 85a4adcde1..287303ef75 100644 --- a/Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From c2e051f14566828068e6014245021402afe3df26 Mon Sep 17 00:00:00 2001 +From 3d9e07b20844b8039fe250c34ff50cf330622471 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world Also fix view distance lookup diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 967aae838..b3fbc8249 100644 +index 967aae838e..b3fbc8249e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -573,8 +573,12 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo @@ -25,7 +25,7 @@ index 967aae838..b3fbc8249 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index c43a90333..ed4ca8abb 100644 +index c43a90333b..ed4ca8abb2 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -200,8 +200,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -44,5 +44,5 @@ index c43a90333..ed4ca8abb 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 33d5985c69..91576aca84 100644 --- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 2fbf2c556d7840198741959940696a14c7e3c26a Mon Sep 17 00:00:00 2001 +From 5fe4df0be5a011f8ee6610a8fdf97b15fc8a4e1d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement diff --git a/Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch index db9b3211bd..516c48aaa4 100644 --- a/Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 5998e59699d7927e6937cc3df8d056504fa7f2c0 Mon Sep 17 00:00:00 2001 +From 61e6eb2cca1a5dc3e4a514af80353eaa98cd7bd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 21ee154a5..a144118f6 100644 +index 21ee154a57..a144118f66 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -1041,7 +1041,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -21,7 +21,7 @@ index 21ee154a5..a144118f6 100644 Iterator iterator = entity.bP().iterator(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 06991baca..56676f34b 100644 +index dcff6c8d8a..336e6aeef6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -992,6 +992,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -33,5 +33,5 @@ index 06991baca..56676f34b 100644 return false; } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch index 83302beb09..8519cd6728 100644 --- a/Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From 8940a41d893f9fb606b307aea8d348faa7dee34c Mon Sep 17 00:00:00 2001 +From 049ceb1e1da52d7580d5f05bff70a4d9955f589b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index 83db94c4a..dd635292e 100644 +index 83db94c4ab..dd635292ec 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java @@ -215,9 +215,11 @@ public class DefinedStructure { @@ -25,7 +25,7 @@ index 83db94c4a..dd635292e 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index c5212417c..b3c5766a2 100644 +index c5212417c6..b3c5766a27 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit @@ -37,7 +37,7 @@ index c5212417c..b3c5766a2 100644 private final TileEntityTypes e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER protected World world; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 31a9d4572..458d1561d 100644 +index 31a9d45727..458d1561d0 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -50,13 +50,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { @@ -58,5 +58,5 @@ index 31a9d4572..458d1561d 100644 if (this.world instanceof WorldServer) { try { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index cb46a6c140..1ad1670d21 100644 --- a/Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,11 +1,11 @@ -From 509571b6d0a2ea133f1442e3b8262fb6281fd7df Mon Sep 17 00:00:00 2001 +From 3453dbe4b3b797d14ea8dfdb6e2c010e47335fcb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 65d230d45..9bf2521be 100644 +index 65d230d45f..9bf2521be6 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -86,7 +86,7 @@ public class UserCache { @@ -18,5 +18,5 @@ index 65d230d45..9bf2521be 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch index be507ea127..c74387b1c4 100644 --- a/Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From 6b9fde930c004144814668d3b2747506a64e5a8e Mon Sep 17 00:00:00 2001 +From d62a0a28a9163ccd576919761253e42ae6b97097 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 51ba4a804..088c0147a 100644 +index 66aa3bde64..73907b4f0e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -355,7 +355,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -18,5 +18,5 @@ index 51ba4a804..088c0147a 100644 Location curPos = this.getPlayer().getLocation(); // Spigot -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch index 1b05b6ddef..db941ba847 100644 --- a/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch @@ -1,11 +1,11 @@ -From 12a58c9dfac40299305c3eaf1d0f525235885786 Mon Sep 17 00:00:00 2001 +From a0c08cd775b6d772d818a8571d388d6746320fa3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7ed9903a8..621e79bc5 100644 +index 7ed9903a8c..621e79bc53 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -760,6 +760,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch index 30301597c5..8d3cc99164 100644 --- a/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch @@ -1,11 +1,11 @@ -From 8de2d292f66991d8cebb8501a31fe718da91ba3e Mon Sep 17 00:00:00 2001 +From 2dc12219463415aebdee8014771aeced2951e9ef Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c6d2c3033..b7b28591e 100644 +index c6d2c30339..b7b28591e4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException; @@ -31,7 +31,7 @@ index c6d2c3033..b7b28591e 100644 + } } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index bf67dbf54..dcaba3c40 100644 +index bf67dbf54a..dcaba3c401 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -58,7 +58,8 @@ public class NameReferencingFileConverter { @@ -45,7 +45,7 @@ index bf67dbf54..dcaba3c40 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b0ae0365e..c26da0984 100644 +index b0ae0365e0..c26da09849 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1413,7 +1413,8 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0130-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0130-Optimise-BlockState-s-hashCode-equals.patch index e751d8038f..7fd0ab38ab 100644 --- a/Spigot-Server-Patches/0130-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0130-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From 63f4233aa49d41ab53a84ebd6a20d8d10449855f Mon Sep 17 00:00:00 2001 +From c9f0709ef168a8c27dc55d0238e9519489c42dba Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockState's hashCode/equals @@ -80,5 +80,5 @@ index 2f12e15e07..613cd0bce2 100644 return true; } else if (object instanceof BlockStateInteger && super.equals(object)) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch index 92cc957ea4..e070786b5c 100644 --- a/Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch +++ b/Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch @@ -1,4 +1,4 @@ -From 97d5b2ac6eb096f2e3dd9b51337b8abc5cdfb594 Mon Sep 17 00:00:00 2001 +From 196af651b80059962f3a70483626f52c60df29b9 Mon Sep 17 00:00:00 2001 From: killme Date: Tue, 30 Aug 2016 16:39:48 +0200 Subject: [PATCH] Disable ticking of snow blocks @@ -25,5 +25,5 @@ index 0c8f9d37fd..44ed656263 100644 + //Paper end } -- -2.19.0 +2.21.0 diff --git a/scripts/decompile.sh b/scripts/decompile.sh index 4013638452..a1b06a1f1d 100755 --- a/scripts/decompile.sh +++ b/scripts/decompile.sh @@ -22,10 +22,11 @@ forgeflowercachevalue="$forgeflowerurl - $forgeflowerversion - $forgefloweroptio classdir="$decompiledir/classes" versionjson="$workdir/Minecraft/$minecraftversion/$minecraftversion.json" -if [ ! -f "$versionjson" ]; then +if [[ ! -f "$versionjson" ]]; then echo "Downloading $minecraftversion JSON Data" - verescaped=$(echo ${minecraftversion} | sed 's/\./\\./g') - verentry=$(curl -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | grep -oE "{\"id\": \"${verescaped}\".*${verescaped}\.json") + verescaped=$(echo ${minecraftversion} | sed 's/\-pre/ Pre-Release /g' | sed 's/\./\\./g') + urlescaped=$(echo ${verescaped} | sed 's/ /_/g') + verentry=$(curl -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | grep -oE "\{\"id\": \"${verescaped}\".*${urlescaped}\.json") jsonurl=$(echo $verentry | grep -oE https:\/\/.*\.json) curl -o "$versionjson" "$jsonurl" echo "$versionjson - $jsonurl" @@ -124,7 +125,7 @@ if [ ! -d "$spigotdecompiledir/net" ]; then echo "Decompiling classes (stage 2)..." cd "$basedir" set +e - java -jar "$workdir/BuildData/bin/fernflower.jar" -dgs=1 -hdc=0 -asc=1 -udv=0 -rsy=1 "$classdir" "$spigotdecompiledir" + java -jar "$workdir/BuildData/bin/fernflower.jar" -dgs=1 -hdc=0 -asc=1 -udv=0 -rsy=1 -aoa=1 "$classdir" "$spigotdecompiledir" if [ "$?" != "0" ]; then rm -rf "$spigotdecompiledir/net" echo "Failed to decompile classes." diff --git a/scripts/makemcdevsrc.sh b/scripts/makemcdevsrc.sh index 09349acce9..dd4c4e48aa 100755 --- a/scripts/makemcdevsrc.sh +++ b/scripts/makemcdevsrc.sh @@ -14,7 +14,7 @@ papernms="Paper-Server/src/main/java/net/minecraft/server" mcdevsrc="${decompiledir}/src/net/minecraft/server" rm -rf "${mcdevsrc}" mkdir -p "${mcdevsrc}" -cp "${nms}"/*.java "${mcdevsrc}/" +find ${nms} -name *.java -print0 | xargs -I\{} -0 cp \{} "${mcdevsrc}/" for file in "${nms}/"* do diff --git a/scripts/remap.sh b/scripts/remap.sh index 20f72bf835..3765142085 100755 --- a/scripts/remap.sh +++ b/scripts/remap.sh @@ -45,7 +45,7 @@ fi echo "Applying class mappings..." if [ ! -f "$jarpath-cl.jar" ]; then - java -jar "$workdir/BuildData/bin/SpecialSource-2.jar" map --only . --only net/minecraft --auto-lvt BASIC --auto-synth -i "$jarpath.jar" -m "$classmappings" -o "$jarpath-cl.jar" 1>/dev/null + java -jar "$workdir/BuildData/bin/SpecialSource-2.jar" map --only . --only net/minecraft --auto-lvt BASIC --auto-member SYNTHETIC -i "$jarpath.jar" -m "$classmappings" -o "$jarpath-cl.jar" 1>/dev/null if [ "$?" != "0" ]; then echo "Failed to apply class mappings." exit 1 @@ -54,7 +54,7 @@ fi echo "Applying member mappings..." if [ ! -f "$jarpath-m.jar" ]; then - java -jar "$workdir/BuildData/bin/SpecialSource-2.jar" map --only . --only net/minecraft -i "$jarpath-cl.jar" -m "$membermappings" -o "$jarpath-m.jar" 1>/dev/null + java -jar "$workdir/BuildData/bin/SpecialSource-2.jar" map --only . --only net/minecraft --auto-member TOKENS -i "$jarpath-cl.jar" -m "$membermappings" -o "$jarpath-m.jar" 1>/dev/null if [ "$?" != "0" ]; then echo "Failed to apply member mappings." exit 1 @@ -63,7 +63,7 @@ fi echo "Creating remapped jar..." if [ ! -f "$jarpath-mapped.jar" ]; then - java -jar "$workdir/BuildData/bin/SpecialSource.jar" --only . --only net/minecraft --only com/mojang/brigadier -i "$jarpath-m.jar" --access-transformer "$accesstransforms" -m "$packagemappings" -o "$jarpath-mapped.jar" 1>/dev/null + java -jar "$workdir/BuildData/bin/SpecialSource.jar" --only . --only net/minecraft -i "$jarpath-m.jar" --access-transformer "$accesstransforms" -m "$packagemappings" -o "$jarpath-mapped.jar" 1>/dev/null if [ "$?" != "0" ]; then echo "Failed to create remapped jar." exit 1 diff --git a/work/BuildData b/work/BuildData index 7886694452..601818a24e 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 7886694452c8a42e0f708be0bb846c118bb7180a +Subproject commit 601818a24e1d39ea5c09cbf82932fad6031c44b7 diff --git a/work/Bukkit b/work/Bukkit index da08d02251..263f706c2b 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit da08d02251823cbf94d5f896fcbb33c2e7a871f3 +Subproject commit 263f706c2b25d4a2c0970bbb2bf99112947bc15e diff --git a/work/CraftBukkit b/work/CraftBukkit index a46fdbc62c..48c4c5ca81 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a46fdbc62c828e3f038cacbad9b32607dcc5a2f4 +Subproject commit 48c4c5ca8133cead0e849c546cf7e0865300c94d diff --git a/work/Spigot b/work/Spigot index f09662d0ea..3e47a77bbf 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit f09662d0ea3632c3294c6db86bdcd92f68aac8c2 +Subproject commit 3e47a77bbf13823cba635bfc6b643f3816ae5347