Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
9a793cce Remove no longer applicable caveats to setPlayerListName
7137829e SPIGOT-4496: Undeprecate MapView.getId and make int
de33ade0 Remove some draft API designations
a35fa838 SPIGOT-4472: Add Consumer scheduler methods

CraftBukkit Changes:
8cd538e6 SPIGOT-4498: Crash on startup
b4ee04ba SPIGOT-4496: Undeprecate MapView.getId and make int
ec937d0e SPIGOT-4472: Add Consumer scheduler methods

Spigot Changes:
a1f2566f Use monotonic time for watchdog
bc4adcbf SPIGOT-4498: Crash on startup
bb387e6c Rebuild patches

Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch

@@ -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 7434203a4..575791cf7 100644
+index 79c0e598a..5f3e085e3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch

@@ -69,7 +69,7 @@ index d82790717..658eac264 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 6f87abb91..bd8f8ff10 100644
+index 1e349066d..c9f027f99 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@

Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -40,7 +40,7 @@ index abf68a2c7..fcb03b830 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 95d686c6f..d6ad55468 100644
+index b57b6981d..2096656ee 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Add-String-based-Action-Bar-API.patch

@@ -5,7 +5,7 @@ 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 9011c690d..4b0caae51 100644
+index a9163a5f6..d10e3f99d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Add-player-view-distance-API.patch

@@ -5,7 +5,7 @@ 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 d9680af01..be78cb64f 100644
+index a631529df..4208b0d2c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Complete-resource-pack-API.patch

@@ -5,7 +5,7 @@ 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 d6ad55468..9011c690d 100644
+index 2096656ee..a9163a5f6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bd8f8ff10..f10a9e958 100644
+index c9f027f99..7f6ae5d16 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch

@@ -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 43239f84..fe8d3468 100644
+index 43239f844..fe8d34685 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -0,0 +0,0 @@ public final class NamespacedKey {
@@ -21,7 +21,7 @@ index 43239f84..fe8d3468 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 06bcee03..849ad2cb 100644
+index 06bcee03b..849ad2cbb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -89,7 +89,7 @@ index 06bcee03..849ad2cb 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, 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 10757454..6d5410ea 100644
+index 107574546..6d5410eab 100644
 --- a/src/main/java/org/bukkit/entity/AbstractHorse.java
 +++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
 @@ -0,0 +0,0 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
@@ -102,7 +102,7 @@ index 10757454..6d5410ea 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 9a569d3a..8c5efd17 100644
+index 9a569d3a3..8c5efd17e 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 @@ -0,0 +0,0 @@ public interface AreaEffectCloud extends Entity {
@@ -114,7 +114,7 @@ index 9a569d3a..8c5efd17 100644
      <T> void setParticle(Particle particle, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
-index 98af0563..ec6890ae 100644
+index 98af0563c..ec6890ae6 100644
 --- a/src/main/java/org/bukkit/entity/Guardian.java
 +++ b/src/main/java/org/bukkit/entity/Guardian.java
 @@ -0,0 +0,0 @@ public interface Guardian extends Monster {
@@ -127,7 +127,7 @@ index 98af0563..ec6890ae 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
-index cfce8fa5..8660070b 100644
+index cfce8fa57..8660070bb 100644
 --- a/src/main/java/org/bukkit/entity/Horse.java
 +++ b/src/main/java/org/bukkit/entity/Horse.java
 @@ -0,0 +0,0 @@ public interface Horse extends AbstractHorse {
@@ -140,7 +140,7 @@ index cfce8fa5..8660070b 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4b0caae5..45690a2f 100644
+index d10e3f99d..49de086e3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -233,7 +233,7 @@ index 4b0caae5..45690a2f 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 2a02ab85..e33d00b3 100644
+index 2a02ab855..e33d00b30 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -0,0 +0,0 @@ public interface Skeleton extends Monster {
@@ -245,7 +245,7 @@ index 2a02ab85..e33d00b3 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index cf53ea22..62923379 100644
+index cf53ea22f..629233796 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -0,0 +0,0 @@ public interface Zombie extends Monster {
@@ -266,7 +266,7 @@ index cf53ea22..62923379 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 6532c24f..ee0b1273 100644
+index 6532c24fe..ee0b12736 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 @@ -0,0 +0,0 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -286,7 +286,7 @@ index 6532c24f..ee0b1273 100644
      public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
          this(player, hostname, address, realAddress); // Spigot
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 762c43d6..ec2b8b8e 100644
+index 762c43d69..ec2b8b8ed 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -0,0 +0,0 @@ public interface ItemFactory {
@@ -304,7 +304,7 @@ index 762c43d6..ec2b8b8e 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
-index c8e68570..45431b36 100644
+index c8e68570f..45431b360 100644
 --- a/src/main/java/org/bukkit/inventory/Merchant.java
 +++ b/src/main/java/org/bukkit/inventory/Merchant.java
 @@ -0,0 +0,0 @@ public interface Merchant {
@@ -326,7 +326,7 @@ index c8e68570..45431b36 100644
      void setRecipe(int i, 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 1413b361..b4a8051c 100644
+index 1413b361b..b4a8051cc 100644
 --- a/src/main/java/org/bukkit/potion/Potion.java
 +++ b/src/main/java/org/bukkit/potion/Potion.java
 @@ -0,0 +0,0 @@ public class Potion {
@@ -338,7 +338,7 @@ index 1413b361..b4a8051c 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
-index 40f8d12b..33d19228 100644
+index 40f8d12b9..33d192287 100644
 --- a/src/main/java/org/bukkit/potion/PotionBrewer.java
 +++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
 @@ -0,0 +0,0 @@ public interface PotionBrewer {
@@ -351,7 +351,7 @@ index 40f8d12b..33d19228 100644
       */
      public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended);
 diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
-index 034421a7..f1a54c23 100644
+index 034421a76..f1a54c23c 100644
 --- a/src/main/java/org/bukkit/potion/PotionType.java
 +++ b/src/main/java/org/bukkit/potion/PotionType.java
 @@ -0,0 +0,0 @@ public enum PotionType {
@@ -381,7 +381,7 @@ index 034421a7..f1a54c23 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index ab71f3c3..358ea386 100644
+index ab71f3c31..358ea386b 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -0,0 +0,0 @@ public interface Team {

Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -6,7 +6,7 @@ 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 32db4b77..0119a2cd 100644
+index 32db4b77d..0119a2cda 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index 32db4b77..0119a2cd 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 10ee377a..6ad830d7 100644
+index 10ee377a9..6ad830d72 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@@ -68,7 +68,7 @@ index 10ee377a..6ad830d7 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 be78cb64..c763277d 100644
+index 4208b0d2c..fc2d4da89 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch

@@ -369,7 +369,7 @@ index 000000000..3c2b63db4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c763277d3..95d686c6f 100644
+index fc2d4da89..b57b6981d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ package org.bukkit.entity;

Spigot-API-Patches/Player-affects-spawning-API.patch

@@ -5,7 +5,7 @@ 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 fc9a32ce7..d9680af01 100644
+index 0993f31b1..a631529df 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/Player.setPlayerProfile-API.patch

@@ -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 575791cf7..6f87abb91 100644
+index 5f3e085e3..1e349066d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ package org.bukkit.entity;

Spigot-API-Patches/Timings-v2.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 00000000..98079dc0
+index 000000000..98079dc0c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 @@ -0,0 +0,0 @@
@@ -94,7 +94,7 @@ index 00000000..98079dc0
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 00000000..8c43e206
+index 000000000..8c43e2061
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
 @@ -0,0 +0,0 @@
@@ -161,7 +161,7 @@ index 00000000..8c43e206
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 00000000..feddcdbd
+index 000000000..feddcdbd4
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 @@ -0,0 +0,0 @@
@@ -248,7 +248,7 @@ index 00000000..feddcdbd
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 00000000..b2260104
+index 000000000..b2260104c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
 @@ -0,0 +0,0 @@
@@ -330,7 +330,7 @@ index 00000000..b2260104
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
 new file mode 100644
-index 00000000..f222d6b7
+index 000000000..f222d6b7d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
 @@ -0,0 +0,0 @@
@@ -456,7 +456,7 @@ index 00000000..f222d6b7
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 new file mode 100644
-index 00000000..521c985e
+index 000000000..521c985e6
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
 @@ -0,0 +0,0 @@
@@ -662,7 +662,7 @@ index 00000000..521c985e
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 00000000..28d0954a
+index 000000000..28d0954a3
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -0,0 +0,0 @@
@@ -1013,7 +1013,7 @@ index 00000000..28d0954a
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 new file mode 100644
-index 00000000..0e114eb3
+index 000000000..0e114eb32
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 @@ -0,0 +0,0 @@
@@ -1074,7 +1074,7 @@ index 00000000..0e114eb3
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
 new file mode 100644
-index 00000000..a7f1f44d
+index 000000000..a7f1f44d7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
 @@ -0,0 +0,0 @@
@@ -1186,7 +1186,7 @@ index 00000000..a7f1f44d
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 00000000..f907649b
+index 000000000..f907649ba
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -0,0 +0,0 @@
@@ -1476,7 +1476,7 @@ index 00000000..f907649b
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 00000000..56b10e89
+index 000000000..56b10e898
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
 @@ -0,0 +0,0 @@
@@ -1601,7 +1601,7 @@ index 00000000..56b10e89
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 00000000..df7f4259
+index 000000000..df7f42595
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -0,0 +0,0 @@
@@ -1949,7 +1949,7 @@ index 00000000..df7f4259
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 00000000..f63e7033
+index 000000000..f63e7033c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
 @@ -0,0 +0,0 @@
@@ -2142,7 +2142,7 @@ index 00000000..f63e7033
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 00000000..e7c389c0
+index 000000000..e7c389c05
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
 @@ -0,0 +0,0 @@
@@ -2220,7 +2220,7 @@ index 00000000..e7c389c0
 +}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 new file mode 100644
-index 00000000..5edaba12
+index 000000000..5edaba128
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 @@ -0,0 +0,0 @@
@@ -2277,7 +2277,7 @@ index 00000000..5edaba12
 +}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 new file mode 100644
-index 00000000..23ac07f2
+index 000000000..23ac07f2c
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
 @@ -0,0 +0,0 @@
@@ -2318,7 +2318,7 @@ index 00000000..23ac07f2
 +}
 diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
 new file mode 100644
-index 00000000..96274975
+index 000000000..962749750
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
 @@ -0,0 +0,0 @@
@@ -2453,7 +2453,7 @@ index 00000000..96274975
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
 new file mode 100644
-index 00000000..24eae4be
+index 000000000..24eae4bea
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
 @@ -0,0 +0,0 @@
@@ -2530,7 +2530,7 @@ index 00000000..24eae4be
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 new file mode 100644
-index 00000000..9a4f9dca
+index 000000000..9a4f9dca8
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
 @@ -0,0 +0,0 @@
@@ -2875,7 +2875,7 @@ index 00000000..9a4f9dca
 +}
 diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
 new file mode 100644
-index 00000000..df592d85
+index 000000000..df592d855
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
 @@ -0,0 +0,0 @@
@@ -2982,7 +2982,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2ce17440..7fdd1a08 100644
+index 2ce174401..7fdd1a084 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -2994,7 +2994,7 @@ index 2ce17440..7fdd1a08 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 63392d5e..0e7a81c8 100644
+index 63392d5e7..0e7a81c88 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@@ -3028,7 +3028,7 @@ index 63392d5e..0e7a81c8 100644
           *
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 00000000..fd452bce
+index 000000000..fd452bce4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 @@ -0,0 +0,0 @@
@@ -3051,7 +3051,7 @@ index 00000000..fd452bce
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4c931f18..4a479627 100644
+index 4c931f186..4a479627d 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -0,0 +0,0 @@ public abstract class Command {
@@ -3081,7 +3081,7 @@ index 4c931f18..4a479627 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 50257883..9c80f464 100644
+index 502578837..9c80f4640 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -0,0 +0,0 @@ public class FormattedCommandAlias extends Command {
@@ -3104,7 +3104,7 @@ index 50257883..9c80f464 100644
      }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 00000000..5527e7c8
+index 000000000..5527e7c86
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
 @@ -0,0 +0,0 @@
@@ -3214,7 +3214,7 @@ index 00000000..5527e7c8
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index d9183db2..43e52a77 100644
+index d9183db2f..43e52a77a 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
@@ -3249,7 +3249,7 @@ index d9183db2..43e52a77 100644
              // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
 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 bba914d7..00000000
+index bba914d7f..000000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
@@ -3507,7 +3507,7 @@ index bba914d7..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bff56f48..fc9a32ce 100644
+index 5054276ff..0993f31b1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3523,7 +3523,7 @@ index bff56f48..fc9a32ce 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8b130abb..80c152ba 100644
+index 8b130abb7..80c152ba9 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
@@ -3580,7 +3580,7 @@ index 8b130abb..80c152ba 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 113b899c..81b42822 100644
+index 113b899cc..81b428222 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -0,0 +0,0 @@ import org.bukkit.plugin.PluginLoader;
@@ -3629,7 +3629,7 @@ index 113b899c..81b42822 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 af8af8ef..44093af2 100644
+index af8af8ef0..44093af29 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -0,0 +0,0 @@ import org.bukkit.plugin.PluginDescriptionFile;
@@ -3643,7 +3643,7 @@ index af8af8ef..44093af2 100644
      private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
      private final PluginDescriptionFile description;
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 5ca863b3..04804706 100644
+index 5ca863b36..048047067 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.server.ServerListPingEvent;
@@ -3655,7 +3655,7 @@ index 5ca863b3..04804706 100644
 +    public String getData(); // Spigot
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 8d982974..e9f76006 100644
+index 8d982974e..e9f76006e 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
 @@ -0,0 +0,0 @@

Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch

@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index fad2f8f822..4061073b22 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 498a0c4504..1166209840 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -48,7 +48,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                  long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index eed96c60c5..496c5cbdff 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -0,0 +0,0 @@ public class SpigotConfig
@@ -61,7 +61,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index ed5f46bf6f..9dba9510f5 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ import java.lang.management.MonitorInfo;
@@ -91,29 +91,28 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +        earlyWarningDelay = Math.min(PaperConfig.watchdogPrintEarlyWarningDelay, timeoutTime); // Paper
      }
  
-     public static void doStart(int timeoutTime, boolean restart)
+     private static long monotonicMillis()
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
      {
          while ( !stopping )
          {
 -            //
--            if ( lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
+-            if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
 +            // Paper start
-+            long currentTime = System.currentTimeMillis();
++            Logger log = Bukkit.getServer().getLogger();
++            long currentTime = monotonicMillis();
 +            if ( lastTick != 0 && currentTime > lastTick + earlyWarningEvery && !Boolean.getBoolean("disable.watchdog") )
              {
+-                Logger log = Bukkit.getServer().getLogger();
 +                boolean isLongTimeout = currentTime > lastTick + timeoutTime;
 +                // Don't spam early warning dumps
 +                if ( !isLongTimeout && (earlyWarningEvery <= 0 || !hasStarted || currentTime < lastEarlyWarning + earlyWarningEvery || currentTime < lastTick + earlyWarningDelay)) continue;
 +                lastEarlyWarning = currentTime;
++                if (isLongTimeout) {
 +                // Paper end
-                 Logger log = Bukkit.getServer().getLogger();
+                 log.log( Level.SEVERE, "------------------------------" );
-+                // Paper start - Different message when it's a short timeout
+                 log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
-+                if ( isLongTimeout )
+                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-+                {
-                 log.log( Level.SEVERE, "The server has stopped responding!" );
-                 log.log( Level.SEVERE, "Please report this to https://github.com/PaperMC/Paper/issues" );
-                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
                      }
                  }

Spigot-Server-Patches/Add-exception-reporting-event.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 0000000000..93397188b7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +0,0 @@
@@ -50,7 +50,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index d8ea5c1b5d..11fd68f597 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@
@@ -89,7 +89,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 709d384e95..a03748f738 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ import java.util.function.BooleanSupplier;
@@ -118,7 +118,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 1d830dff64..58d971cf20 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -0,0 +0,0 @@
@@ -145,7 +145,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index f991fddf7d..e888c9bdba 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@
@@ -172,7 +172,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index d18921271f..e5115863ec 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@
@@ -191,7 +191,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index b919226bbf..ec43086ad1 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
@@ -219,7 +219,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index e649d662ae..560edb523f 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -0,0 +0,0 @@
@@ -239,7 +239,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 051259cf80..a25c90518f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@
@@ -276,7 +276,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index b21f7073f1..882b8fe4f1 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -0,0 +0,0 @@ public class WorldPersistentData {
@@ -288,10 +288,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              throw throwable1;
          } finally {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9dec941fb7..3f43d9eeab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
+@@ -0,0 +0,0 @@ import java.util.function.Consumer;
  import java.util.logging.Level;
  
  import co.aikar.timings.MinecraftTimings; // Paper

Spigot-Server-Patches/Add-velocity-warnings.patch

@@ -5,7 +5,7 @@ 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 cd17cdcf3..71bdbac13 100644
+index cd17cdcf38..71bdbac134 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index cd17cdcf3..71bdbac13 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 df7c77e9a..2858f11ee 100644
+index df7c77e9aa..2858f11eef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -66,7 +66,7 @@ index df7c77e9a..2858f11ee 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 91b8aa6a1..0c106ea9c 100644
+index 21316d67f1..5d03191c80 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread

Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch

@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 24d608399f..212a50c88e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -0,0 +0,0 @@ import java.io.FileOutputStream;
@@ -172,9 +172,9 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                          {
                              super.visitFieldInsn( opcode, owner, name, desc );
 @@ -0,0 +0,0 @@ public class Commodore
-                     @Override
+                             return;
-                     public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf)
+                         }
-                     {
+ 
 +                        // Paper start - Rewrite plugins
 +                        owner = getOriginalOrRewrite( owner) ;
 +                        if (desc != null)

Spigot-Server-Patches/Improved-Async-Task-Scheduler.patch

@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 0000000000..eaf8692877
+index 0000000000..3c1992e212
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +0,0 @@
@@ -149,11 +149,6 @@ index 0000000000..eaf8692877
 +        }
 +    }
 +
-+    @Override
-+    public synchronized void cancelAllTasks() {
-+        cancelTasks(null);
-+    }
-+
 +    /**
 +     * Task is not cancelled
 +     * @param runningTask
@@ -164,10 +159,10 @@ index 0000000000..eaf8692877
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index a2fadaf82c..223afc7edc 100644
+index 5f228373e3..a9107ce5d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
+@@ -0,0 +0,0 @@ import java.util.function.Consumer;
  import java.util.logging.Level;
  
  import co.aikar.timings.MinecraftTimings; // Paper
@@ -205,6 +200,7 @@ index a2fadaf82c..223afc7edc 100644
          RECENT_TICKS = 30;
      }
  
++
 +    // Paper start
 +    private final CraftScheduler asyncScheduler;
 +    private final boolean isAsyncScheduler;
@@ -221,10 +217,9 @@ index a2fadaf82c..223afc7edc 100644
 +        }
 +    }
 +    // Paper end
-+
+     @Override
      public int scheduleSyncDelayedTask(final Plugin plugin, final Runnable task) {
          return this.scheduleSyncDelayedTask(plugin, task, 0L);
-     }
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
          } else if (period < CraftTask.NO_REPEATING) {
              period = CraftTask.NO_REPEATING;
@@ -233,7 +228,7 @@ index a2fadaf82c..223afc7edc 100644
 +        return handle(new CraftAsyncTask(this.asyncScheduler.runners, plugin, runnable, nextId(), period), delay); // Paper
      }
  
-     public <T> Future<T> callSyncMethod(final Plugin plugin, final Callable<T> task) {
+     @Override
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
          if (taskId <= 0) {
              return;
@@ -247,7 +242,7 @@ index a2fadaf82c..223afc7edc 100644
          if (task != null) {
              task.cancel0();
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
- 
+     @Override
      public void cancelTasks(final Plugin plugin) {
          Validate.notNull(plugin, "Cannot cancel tasks of null plugin");
 +        // Paper start
@@ -259,20 +254,8 @@ index a2fadaf82c..223afc7edc 100644
                  new Runnable() {
                      public void run() {
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-     }
- 
-     public void cancelAllTasks() {
-+        // Paper start
-+        if (!this.isAsyncScheduler) {
-+            this.asyncScheduler.cancelAllTasks();
-+        }
-+        // Paper end
-         final CraftTask task = new CraftTask(
-                 new Runnable() {
-                     public void run() {
-@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-     }
  
+     @Override
      public boolean isCurrentlyRunning(final int taskId) {
 +        // Paper start
 +        if (!isAsyncScheduler) {
@@ -297,8 +280,8 @@ index a2fadaf82c..223afc7edc 100644
              if (task.getTaskId() == taskId) {
                  return task.getPeriod() >= CraftTask.NO_REPEATING; // The task will run
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-     }
  
+     @Override
      public List<BukkitWorker> getActiveWorkers() {
 +        // Paper start
 +        if (!isAsyncScheduler) {

Spigot-Server-Patches/Remove-CraftScheduler-Async-Task-Debugger.patch

@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 26753fac5e..a2fadaf82c 100644
+index 3f43d9eeab..5f228373e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {

Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -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 b64cac252..526f3af51 100644
+index b64cac2523..526f3af516 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
 @@ -0,0 +0,0 @@ public class EULA {
@@ -19,7 +19,7 @@ index b64cac252..526f3af51 100644
                  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 2d812b024..8a6589d95 100644
+index 2d812b0242..8a6589d95d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -32,7 +32,7 @@ index 2d812b024..8a6589d95 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 174605b6e..29b016e17 100644
+index 174605b6e1..29b016e174 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.server.TabCompleteEvent;
@@ -45,7 +45,7 @@ index 174605b6e..29b016e17 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 28a34b54e..1ce1a2435 100644
+index 28a34b54e0..1ce1a2435d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {
@@ -76,7 +76,7 @@ index 28a34b54e..1ce1a2435 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 94a3d4237..91b8aa6a1 100644
+index 14a1084aa2..21316d67f1 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
@@ -91,9 +91,15 @@ index 94a3d4237..91b8aa6a1 100644
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
              {
                  Logger log = Bukkit.getServer().getLogger();
-                 log.log( Level.SEVERE, "The server has stopped responding!" );
+                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "Please report this to http://www.spigotmc.org/" );
+-                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." );
-+                log.log( Level.SEVERE, "Please report this to https://github.com/PaperMC/Paper/issues" );
++                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
+                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
+                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
+                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
+                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
+-                log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" );
++                log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
                  log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
 -                log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
 +                log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );

Spigot-Server-Patches/System-property-for-disabling-watchdoge.patch

@@ -5,16 +5,16 @@ 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 0c106ea9c5..57a4748a30 100644
+index 5d03191c80..ed5f46bf6f 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
          while ( !stopping )
          {
              //
--            if ( lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime )
+-            if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime )
-+            if ( lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
++            if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
              {
                  Logger log = Bukkit.getServer().getLogger();
-                 log.log( Level.SEVERE, "The server has stopped responding!" );
+                 log.log( Level.SEVERE, "------------------------------" );
 --

Spigot-Server-Patches/Timings-v2.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..a6292f1d7
+index 0000000000..66d02e048b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +0,0 @@
@@ -51,7 +51,7 @@ index 000000000..a6292f1d7
 +    public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
 +    public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
 +
-+    private static final Map<Class<? extends Runnable>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
++    private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
 +
 +    private MinecraftTimings() {}
 +
@@ -67,9 +67,9 @@ index 000000000..a6292f1d7
 +        }
 +        Plugin plugin;
 +
-+        Runnable task = ((CraftTask) bukkitTask).task;
++        CraftTask craftTask = (CraftTask) bukkitTask;
 +
-+        final Class<? extends Runnable> taskClass = task.getClass();
++        final Class<?> taskClass = craftTask.getTaskClass();
 +        if (bukkitTask.getOwner() != null) {
 +            plugin = bukkitTask.getOwner();
 +        } else {
@@ -144,7 +144,7 @@ index 000000000..a6292f1d7
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..145cb274b
+index 0000000000..145cb274b0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +0,0 @@
@@ -253,7 +253,7 @@ index 000000000..145cb274b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 87a7b6980..2f17e5219 100644
+index 87a7b69800..2f17e5219c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ import java.util.concurrent.TimeUnit;
@@ -297,7 +297,7 @@ index 87a7b6980..2f17e5219 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index dfcb285df..bb8b450ac 100644
+index dfcb285df5..bb8b450ac4 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -0,0 +0,0 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index dfcb285df..bb8b450ac 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e634325ba..68ba638c6 100644
+index e634325ba8..68ba638c6b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index e634325ba..68ba638c6 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 85a065f03..4b8b77710 100644
+index 85a065f039..4b8b77710b 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -0,0 +0,0 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -357,7 +357,7 @@ index 85a065f03..4b8b77710 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5819e86f3..7239f5437 100644
+index 5819e86f32..7239f54377 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index 5819e86f3..7239f5437 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 71c0e069a..e53e40e43 100644
+index 71c0e069a6..e53e40e439 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@
@@ -445,7 +445,7 @@ index 71c0e069a..e53e40e43 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index b7cdc495a..8b9b076de 100644
+index b7cdc495a3..8b9b076ded 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -0,0 +0,0 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index b7cdc495a..8b9b076de 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 4d7e15179..40ff72f72 100644
+index 4d7e151793..40ff72f725 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -0,0 +0,0 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index 4d7e15179..40ff72f72 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7f56df0b6..b488178d5 100644
+index 7f56df0b66..b488178d5b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Level;
@@ -538,7 +538,7 @@ index 7f56df0b6..b488178d5 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fde9d4d51..c765b5cf3 100644
+index fde9d4d517..c765b5cf32 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index fde9d4d51..c765b5cf3 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 03cd1db36..dec9d2d08 100644
+index 03cd1db365..dec9d2d08c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -653,7 +653,7 @@ index 03cd1db36..dec9d2d08 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ae31935c4..70c9b1f50 100644
+index ae31935c48..70c9b1f50c 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -0,0 +0,0 @@ public class EntityTracker {
@@ -684,7 +684,7 @@ index ae31935c4..70c9b1f50 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bdbd24b6b..2d812b024 100644
+index bdbd24b6b5..2d812b0242 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@
@@ -837,7 +837,7 @@ index bdbd24b6b..2d812b024 100644
          this.methodProfiler.e();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 15194bd63..12a8fec29 100644
+index 15194bd635..12a8fec29a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -0,0 +0,0 @@
@@ -931,7 +931,7 @@ index 15194bd63..12a8fec29 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 358e7429b..784b62c7c 100644
+index 358e7429b3..784b62c7c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;
@@ -986,7 +986,7 @@ index 358e7429b..784b62c7c 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 616797dc6..3a5daf670 100644
+index 616797dc6e..3a5daf6705 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -0,0 +0,0 @@
@@ -1007,7 +1007,7 @@ index 616797dc6..3a5daf670 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 393c4c118..4d800957a 100644
+index 17b4245417..85947fb678 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@
@@ -1031,7 +1031,7 @@ index 393c4c118..4d800957a 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index a07895935..ee5c2421b 100644
+index a07895935e..ee5c2421bb 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -0,0 +0,0 @@ public class TickListServer<T> implements TickList<T> {
@@ -1085,7 +1085,7 @@ index a07895935..ee5c2421b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497..68ac014aa 100644
+index c69209497b..68ac014aab 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -0,0 +0,0 @@ import javax.annotation.Nullable;
@@ -1105,7 +1105,7 @@ index c69209497..68ac014aa 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 433d0ad96..759fa98c4 100644
+index 433d0ad96a..759fa98c45 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@
@@ -1220,7 +1220,7 @@ index 433d0ad96..759fa98c4 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 74a61f300..d10fb980d 100644
+index 74a61f300c..d10fb980dd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@
@@ -1327,7 +1327,7 @@ index 74a61f300..d10fb980d 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1813f3d5..174605b6e 100644
+index f1813f3d5a..174605b6e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -1364,7 +1364,7 @@ index f1813f3d5..174605b6e 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 666d1eb9e..000000000
+index 2ab4b11a8d..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
@@ -1433,8 +1433,6 @@ index 666d1eb9e..000000000
 -
 -        if (task.getOwner() != null) {
 -            plugin = task.getOwner().getDescription().getFullName();
--        } else if (ctask.timingName != null) {
--            plugin = "CraftScheduler";
 -        } else {
 -            plugin = "Unknown";
 -        }
@@ -1544,7 +1542,7 @@ index 666d1eb9e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f0..52a8c48fa 100644
+index 413dd35f06..52a8c48fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -0,0 +0,0 @@
@@ -1580,7 +1578,7 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1a5937b1..b5afd5d1c 100644
+index b1a5937b1e..b5afd5d1c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1599,11 +1597,11 @@ index b1a5937b1..b5afd5d1c 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index f11bd7545..93b9134d6 100644
+index b0f1f83728..9dec941fb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicInteger;
+@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
- import java.util.concurrent.atomic.AtomicReference;
+ import java.util.function.Consumer;
  import java.util.logging.Level;
  
 +import co.aikar.timings.MinecraftTimings; // Paper
@@ -1628,15 +1626,6 @@ index f11bd7545..93b9134d6 100644
          handle(task, 0L);
          for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
              if (taskPending == task) {
-@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-                         CraftScheduler.this.pending.clear();
-                         CraftScheduler.this.temp.clear();
-                     }
--                });
-+                }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
-         handle(task, 0L);
-         for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
-             if (taskPending == task) {
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
              if (task.isSync()) {
                  currentTask = task;
@@ -1675,12 +1664,12 @@ index f11bd7545..93b9134d6 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 7e7ce9a81..46029ce24 100644
+index 3ec0f393ed..7490a187ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.scheduler;
- package org.bukkit.craftbukkit.scheduler;
  
+ import java.util.function.Consumer;
  import org.bukkit.Bukkit;
 -import org.bukkit.craftbukkit.SpigotTimings; // Spigot
 -import org.spigotmc.CustomTimingsHandler; // Spigot
@@ -1693,8 +1682,10 @@ index 7e7ce9a81..46029ce24 100644
       */
      private volatile long period;
      private long nextRun;
--    private final Runnable task;
+-    private final Runnable rTask;
-+    public final Runnable task; // Paper
+-    private final Consumer<BukkitTask> cTask;
++    public final Runnable rTask; // Paper
++    public final Consumer<BukkitTask> cTask; // Paper
 +    public Timing timings; // Paper
      private final Plugin plugin;
      private final int id;
@@ -1707,57 +1698,55 @@ index 7e7ce9a81..46029ce24 100644
          this(null, task, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
      }
  
--    // Spigot start
+-    CraftTask(final Plugin plugin, final Object task, final int id, final long period) {
--    public String timingName = null;
++    CraftTask(final Plugin plugin, final Object task, final int id, final long period) { // Paper
--    CraftTask(String timingName) {
--        this(timingName, null, null, -1, -1);
--    }
--    CraftTask(String timingName, final Runnable task) {
--        this(timingName, null, task, -1, -1);
--    }
--    CraftTask(String timingName, final Plugin plugin, final Runnable task, final int id, final long period) {
-+    CraftTask(final Plugin plugin, final Runnable task, final int id, final long period) { // Paper
          this.plugin = plugin;
-         this.task = task;
+         if (task instanceof Runnable) {
+             this.rTask = (Runnable) task;
+@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
+         }
          this.id = id;
          this.period = period;
--        this.timingName = timingName == null && task == null ? "Unknown" : timingName;
+-        this.timings = this.isSync() ? SpigotTimings.getPluginTaskTimings(this, period) : null; // Spigot
--        timings = this.isSync() ? SpigotTimings.getPluginTaskTimings(this, period) : null;
--    }
--
--    CraftTask(final Plugin plugin, final Runnable task, final int id, final long period) {
--        this(null, plugin, task, id, period);
--    // Spigot end
 +        timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : null; // Paper
      }
  
-     public final int getTaskId() {
+     @Override
 @@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
-     }
  
+     @Override
      public void run() {
 +        if (timings != null && isSync()) timings.startTiming(); // Paper
-         task.run();
+         if (rTask != null) {
+             rTask.run();
+         } else {
+             cTask.accept(this);
+         }
 +        if (timings != null && isSync()) timings.stopTiming(); // Paper
      }
  
      long getPeriod() {
 @@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
-         setPeriod(CraftTask.CANCEL);
+         this.next = next;
+     }
+ 
+-    Class<?> getTaskClass() {
++    public Class<?> getTaskClass() {
+         return (rTask != null) ? rTask.getClass() : ((cTask != null) ? cTask.getClass() : null);
+     }
+ 
+@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
          return true;
      }
--
+ 
 -    // Spigot start
 -    public String getTaskName() {
--        if (timingName != null) {
+-        return (getTaskClass() == null) ? "Unknown" : getTaskClass().getName();
--            return timingName;
--        }
--        return task.getClass().getName();
 -    }
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b78..3d90b34268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -0,0 +0,0 @@ import org.bukkit.util.CachedServerIcon;
@@ -1769,7 +1758,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c1071c92e..a99c0cea0 100644
+index c1071c92ee..a99c0cea0f 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -0,0 +0,0 @@ import net.minecraft.server.EntityWither;