Merge remote-tracking branch 'upstream/master'

Spigot-API-Patches/0004-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 49b1fdef6d2269b82a1a62564258e774b82a2e0d Mon Sep 17 00:00:00 2001
+From 5ce5f42f189e7b311d05e11f6e01e0d8aa1e0e9a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3139,7 +3139,7 @@ index 00000000..5989ee21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 27988a66..cffa0c65 100644
+index a3c4b148..7e416f08 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 {
@@ -3151,10 +3151,10 @@ index 27988a66..cffa0c65 100644
 
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 12660040..9f7f760a 100644
+index 2767f4e5..5b5a3bc5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1278,6 +1278,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -1276,6 +1276,26 @@ public interface Server extends PluginMessageRecipient {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
 

Spigot-API-Patches/0014-Expose-server-CommandMap.patch

@@ -1,14 +1,14 @@
-From b61d6612271e90b23b9ffeb9d5a16d9df184287a Mon Sep 17 00:00:00 2001
+From 4bb41dfd359a71a79ef8b9b30a6b3ec0bb6d9cbe Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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 2ad9a7d7f..3a80f2e29 100644
+index c1e2c13c..a887f3a4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1517,6 +1517,19 @@ public final class Bukkit {
+@@ -1515,6 +1515,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
 
@@ -29,7 +29,7 @@ index 2ad9a7d7f..3a80f2e29 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 3ad70b92f..4c3156071 100644
+index 609b818b..145f6df7 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 {
@@ -49,5 +49,5 @@ index 3ad70b92f..4c3156071 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

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

@@ -1,15 +1,15 @@
-From 9ffedfc9f2e8b401d42cf593c943f35d508d828e Mon Sep 17 00:00:00 2001
+From 874894dd241b0209a8c6da3d129d8c4c7b54da1e Mon Sep 17 00:00:00 2001
 From: William <[email protected]>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
  reload
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e27bdb7bf..d009aebd6 100644
+index 9b0cc417..03ba0b38 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1548,6 +1548,13 @@ public final class Bukkit {
+@@ -1546,6 +1546,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,18 +24,18 @@ index e27bdb7bf..d009aebd6 100644
 
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ab0438b81..e7e7dab8c 100644
+index ab2ff962..2a47c12d 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 {
+@@ -1364,4 +1364,6 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Spigot spigot();
      // Spigot end
 +
 +    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 1104c6037..ba118dbfe 100644
+index 1104c603..ba118dbf 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 {
@@ -85,7 +85,7 @@ index 1104c6037..ba118dbfe 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 4c55f5f8c..12e17709c 100644
+index 4c55f5f8..12e17709 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 {
@@ -103,5 +103,5 @@ index 4c55f5f8c..12e17709c 100644
 +
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

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

@@ -1,15 +1,15 @@
-From ad0c8ca9e48518bfdc7f2d0b624298e45ab22aae Mon Sep 17 00:00:00 2001
+From 54b4f18178eb3da5a5fd08228ed6d5c305b758c1 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 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 d009aebd6..8e0cbbf15 100644
+index 03ba0b38..08570c13 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1555,6 +1555,15 @@ public final class Bukkit {
+@@ -1553,6 +1553,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,18 +26,18 @@ index d009aebd6..8e0cbbf15 100644
 
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e7e7dab8c..8f61619a3 100644
+index 2a47c12d..fc8887d1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1368,4 +1368,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1366,4 +1366,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
 
      void reloadPermissions(); // Paper
 +
 +    boolean reloadCommandAliases(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index bd2c7a696..864c263bb 100644
+index bd2c7a69..864c263b 100644
 --- a/src/main/java/org/bukkit/command/CommandMap.java
 +++ b/src/main/java/org/bukkit/command/CommandMap.java
 @@ -128,4 +128,14 @@ public interface CommandMap {
@@ -56,7 +56,7 @@ index bd2c7a696..864c263bb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index f52d91d19..d7ca4fa3f 100644
+index 682d27f9..b78f3d69 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 {
@@ -72,7 +72,7 @@ index f52d91d19..d7ca4fa3f 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 ba118dbfe..607323a83 100644
+index ba118dbf..607323a8 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 {
@@ -99,5 +99,5 @@ index ba118dbfe..607323a83 100644
                  confirmed = true;
              } else {
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

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

@@ -1,15 +1,15 @@
-From c74ed751192df73e8d8ee4ccc6c8cec0d44a2116 Mon Sep 17 00:00:00 2001
+From 4f011a6ef6937532fb005fc8e9cb96a161797aee Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
  suggested
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8e0cbbf15..90b41fd25 100644
+index 08570c13..92bc8eb6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1564,6 +1564,16 @@ public final class Bukkit {
+@@ -1562,6 +1562,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 8e0cbbf15..90b41fd25 100644
 
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8f61619a3..fe3144c00 100644
+index fc8887d1..9fa704e3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1370,4 +1370,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1368,4 +1368,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
 
      boolean reloadCommandAliases(); // Paper
@@ -46,7 +46,7 @@ index 8f61619a3..fe3144c00 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 92c23424e..e420b7902 100644
+index 92c23424..e420b790 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
@@ -58,5 +58,5 @@ index 92c23424e..e420b7902 100644
          }
          return completions;
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From cccc14b25c7e3a218b057172eb111bcb5b89ca27 Mon Sep 17 00:00:00 2001
+From 8f58cb84e00ad24f5c1b741bdb90a5eb4a162daf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 000000000..476151d2a
+index 00000000..476151d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 @@ -0,0 +1,145 @@
@@ -158,7 +158,7 @@ index 000000000..476151d2a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
-index 000000000..7b3b6ef53
+index 00000000..7b3b6ef5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 @@ -0,0 +1,72 @@
@@ -235,10 +235,10 @@ index 000000000..7b3b6ef53
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 90b41fd25..16fa78b86 100644
+index 92bc8eb6..7c97b11b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1574,6 +1574,40 @@ public final class Bukkit {
+@@ -1572,6 +1572,40 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -280,10 +280,10 @@ index 90b41fd25..16fa78b86 100644
 
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fe3144c00..edbfa3fdc 100644
+index 9fa704e3..bf75e6a2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1379,5 +1379,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1377,5 +1377,33 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
@@ -318,5 +318,5 @@ index fe3144c00..edbfa3fdc 100644
      // Paper end
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch

@@ -1,14 +1,14 @@
-From b15f7b990de34ce684599ca6515f879f1a2545b3 Mon Sep 17 00:00:00 2001
+From 43b3d39441d0688fed79d22abc35a9c7b461f009 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 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 19fb0e5d..6b0a0906 100644
+index fab360c0..3b3d2712 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1589,6 +1589,15 @@ public final class Bukkit {
+@@ -1587,6 +1587,15 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
 
@@ -25,10 +25,10 @@ index 19fb0e5d..6b0a0906 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 1df58f72..66d22ba7 100644
+index ce2644fe..66e53c51 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1392,6 +1392,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1390,6 +1390,13 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
 
@@ -56,5 +56,5 @@ index c2c19ed4..f0222fc2 100644
              for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
                  target.sendMessage(line);
 -- 
-2.17.1
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch

@@ -0,0 +1,32 @@
+From 003eef8da9f2ab01b1c94002a101912398d4772d Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Fri, 19 Apr 2019 12:41:19 -0500
+Subject: [PATCH] Mob Spawner API Enhancements
+
+
+diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java
+index 5773e99e..31c5a006 100644
+--- a/src/main/java/org/bukkit/block/CreatureSpawner.java
++++ b/src/main/java/org/bukkit/block/CreatureSpawner.java
+@@ -199,4 +199,18 @@ public interface CreatureSpawner extends BlockState {
+      * @param spawnRange the new spawn range
+      */
+     public void setSpawnRange(int spawnRange);
++
++    // Paper start
++    /**
++     * Check if spawner is activated (a player is close enough)
++     *
++     * @return True if a player is close enough to activate it
++     */
++    public boolean isActivated();
++
++    /**
++     * Resets the spawn delay timer within the min/max range
++     */
++    public void resetTimer();
++    // Paper end
+ }
+-- 
+2.17.2 (Apple Git-113)
+