Remove obsolete EntityMountEvent and EntityDismountEvent

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From b09559028d66006cba0f4ea3f3d32af2120ee747 Mon Sep 17 00:00:00 2001
+From f0cc86274ee13f62e9e89a9dbb62737b1e79cf08 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes

Bukkit-Patches/0002-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From 2a2e5a4b3404613a0710546bb01632aa1d33c141 Mon Sep 17 00:00:00 2001
+From b086203c843ba9a5da191510163d85ae2b0f5649 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 15 May 2017 15:16:15 +1000
 Subject: [PATCH] Skeleton API Implementations

Bukkit-Patches/0003-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 7e9b6ec04e310588189bc8c5ffae63d241098660 Mon Sep 17 00:00:00 2001
+From 0083f0bd7f088cbfde9cbf84a45f52e640f054d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings

Bukkit-Patches/0004-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From c06e87e317be91d21912680e33896b0f6907c61d Mon Sep 17 00:00:00 2001
+From 430e932e9e52168d7ba600dc0e6f672060ca8965 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support

Bukkit-Patches/0005-Entity-Mount-and-Dismount-Events.patch

@@ -1,4 +1,4 @@
-From be774321b91e8620bc6e22f9591951fa39696264 Mon Sep 17 00:00:00 2001
+From de338828b1112a8c1bf81bd24cf8bcfaab56736b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 2 Jul 2013 20:32:53 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
@@ -6,21 +6,28 @@ Subject: [PATCH] Entity Mount and Dismount Events
 
 diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 new file mode 100644
-index 00000000..00d8ec81
+index 00000000..be9560ff
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,55 @@
 +package org.spigotmc.event.entity;
 +
 +import org.bukkit.entity.Entity;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called when an entity stops riding another entity.
++ *
++ * @deprecated replaced by {@link org.bukkit.event.entity.EntityDismountEvent}.
++ * This event will never be called directly and instead will be dynamically
++ * replaced by {@link org.bukkit.event.entity.EntityDismountEvent}.
 + */
++@Deprecated
++@ApiStatus.ScheduledForRemoval
 +public class EntityDismountEvent extends EntityEvent implements Cancellable {
 +
 +    private static final HandlerList handlers = new HandlerList();
@@ -60,21 +67,28 @@ index 00000000..00d8ec81
 +}
 diff --git a/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
 new file mode 100644
-index 00000000..de9c41ef
+index 00000000..b1b21227
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,55 @@
 +package org.spigotmc.event.entity;
 +
 +import org.bukkit.entity.Entity;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called when an entity attempts to ride another entity.
++ *
++ * @deprecated replaced by {@link org.bukkit.event.entity.EntityMountEvent}.
++ * This event will never be called directly and instead will be dynamically
++ * replaced by {@link org.bukkit.event.entity.EntityMountEvent}.
 + */
++@Deprecated
++@ApiStatus.ScheduledForRemoval
 +public class EntityMountEvent extends EntityEvent implements Cancellable {
 +
 +    private static final HandlerList handlers = new HandlerList();
@@ -112,16 +126,6 @@ index 00000000..de9c41ef
 +        return handlers;
 +    }
 +}
-diff --git a/src/main/java/org/spigotmc/event/entity/package-info.java b/src/main/java/org/spigotmc/event/entity/package-info.java
-new file mode 100644
-index 00000000..264664eb
---- /dev/null
-+++ b/src/main/java/org/spigotmc/event/entity/package-info.java
-@@ -0,0 +1,4 @@
-+/**
-+ * Spigot-specific entity events.
-+ */
-+package org.spigotmc.event.entity;
 -- 
 2.43.0
 

Bukkit-Patches/0006-Add-respawn-API.patch

@@ -1,4 +1,4 @@
-From 1a5ebf9908ceb20bdeb13c95ad5c2f47f07d1aa4 Mon Sep 17 00:00:00 2001
+From 0fe2f6da41133d9916331a7f8158e623f4af4b10 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.

Bukkit-Patches/0007-Add-support-for-fetching-hidden-players.patch

@@ -1,4 +1,4 @@
-From b3cd11af47fd4dbb462c6afbfd98f996ba0527be Mon Sep 17 00:00:00 2001
+From 992f2629c88961aadf908554b8cd104e70a6d18c Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players

Bukkit-Patches/0008-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From bb1fe92288f21eccdd042e9a1c9f3e59d2ef5842 Mon Sep 17 00:00:00 2001
+From ce9555726679c98813d0d8154233761a6ef94621 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:29 -0400
 Subject: [PATCH] Silenceable Lightning API

Bukkit-Patches/0009-Add-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From f157666ae13dd13f76a0bf466619fd73298ae351 Mon Sep 17 00:00:00 2001
+From ed28921780378dfab8de897fa293876161b2a7ec Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:01:32 +0200
 Subject: [PATCH] Add PlayerSpawnLocationEvent.

Bukkit-Patches/0010-BungeeCord-Chat-API.patch

@@ -1,4 +1,4 @@
-From 6ab5d77fae80c9d4b767ea68c8aea3283bbf95c0 Mon Sep 17 00:00:00 2001
+From c5679da77565994c87e64dd0696d49bde3a636f7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 02:59:14 +0100
 Subject: [PATCH] BungeeCord Chat API

Bukkit-Patches/0011-Add-restart-API.patch

@@ -1,4 +1,4 @@
-From 0d0fe8315d1bc23a1d3fc6e753f1bd0ae769e234 Mon Sep 17 00:00:00 2001
+From cd46fa86aca2a569faeb5ca1da9becead709694d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 13 Jul 2015 19:10:15 +1000
 Subject: [PATCH] Add restart API.

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 0d3a67e58a7800b50420731dab439245b7510322 Mon Sep 17 00:00:00 2001
+From b782b90f07ef5aaba1313901f1e7486f5cfc2867 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
@@ -34,7 +34,7 @@ index ec61ec7570..b3da3373ac 100644
          <!-- See http://checkstyle.sourceforge.net/config_imports.html -->
          <module name="AvoidStarImport">
 diff --git a/pom.xml b/pom.xml
-index 946275ae7f..123a452635 100644
+index a9ffd7fa5e..266853a682 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,13 +1,20 @@

CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From 842b0aed3767e1bc23df2609ebda17d2bf607691 Mon Sep 17 00:00:00 2001
+From 04be24fd1a3fa3afc34946a59f34305250afbb84 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations

CraftBukkit-Patches/0003-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 86e5b12c4aeec1261e4e16923813449dca973e99 Mon Sep 17 00:00:00 2001
+From 6100a2c5ecba16110a36a921f533727512d99221 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration

CraftBukkit-Patches/0004-Crop-Growth-Rates.patch

@@ -1,4 +1,4 @@
-From 93c69c16f7236b47edf1e62551e65b61a18af7f3 Mon Sep 17 00:00:00 2001
+From b026f796b5172608455d781ca46db380c6a1279d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 7 Mar 2016 22:14:13 +1100
 Subject: [PATCH] Crop Growth Rates

CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From c5441a7beb47c05fde90854ae3ff6c9223faf793 Mon Sep 17 00:00:00 2001
+From e698acaf27f53af1354285b23c821042ddf568b3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration

CraftBukkit-Patches/0006-Async-Operation-Catching.patch

@@ -1,4 +1,4 @@
-From 6728798f1a9b7c93c33935f0dc5155304405a063 Mon Sep 17 00:00:00 2001
+From 178bec0fa964a66c4c149af7d15df70ad4b1d87c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching

CraftBukkit-Patches/0007-View-Distance.patch

@@ -1,4 +1,4 @@
-From 7e1fdc07075544184f8cbb3a22601e8dd7cd8336 Mon Sep 17 00:00:00 2001
+From 7fa75ffd8fa4e11e7367e19dc7c0a44d0dd8b4cb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance

CraftBukkit-Patches/0008-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From d16210ba51eae0a60d03ea2d12e4200c1cc6734f Mon Sep 17 00:00:00 2001
+From e8045af9db6ba518db761f5c7a9e894f06de23c5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -321,7 +321,7 @@ index ee64c4546d..bd76f469a0 100644
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a86c04c92d..1d1471aeb0 100644
+index 5f6680fdad..9999b8404a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -137,6 +137,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -332,7 +332,7 @@ index a86c04c92d..1d1471aeb0 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -313,6 +314,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -315,6 +316,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
      // Marks an entity, that it was removed by a plugin via Entity#remove
      // Main use case currently is for SPIGOT-7487, preventing dropping of leash when leash is removed
      public boolean pluginRemoved = false;
@@ -340,7 +340,7 @@ index a86c04c92d..1d1471aeb0 100644
  
      public float getBukkitYaw() {
          return this.yRot;
-@@ -790,6 +792,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -792,6 +794,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -348,7 +348,7 @@ index a86c04c92d..1d1471aeb0 100644
          if (this.noPhysics) {
              this.setPos(this.getX() + vec3d.x, this.getY() + vec3d.y, this.getZ() + vec3d.z);
          } else {
-@@ -950,6 +953,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -952,6 +955,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
                  this.level().getProfiler().pop();
              }
          }

CraftBukkit-Patches/0009-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From d32677c5c97c5c4ea64e754013d250db4ba039f6 Mon Sep 17 00:00:00 2001
+From a5514f1c19e3f1c7f58bdbe9281559df54fe0ad3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance

CraftBukkit-Patches/0010-Item-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 8f43f3adf9b5ba752ffada2860aa157e092ebc6c Mon Sep 17 00:00:00 2001
+From e532e0cfff45be0d42dd5776b1097cce866ca88e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate

CraftBukkit-Patches/0011-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From de57c847f46e5f316d799aac4332721eadffbeae Mon Sep 17 00:00:00 2001
+From cd0c89689abe865ebbf8eb9c14f11a0443a391b6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -35,10 +35,10 @@ index cdfa973454..a1b3b4911e 100644
          entity.setOldPosAndRot();
          GameProfilerFiller gameprofilerfiller = this.getProfiler();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1d1471aeb0..a7c38c5293 100644
+index 9999b8404a..0016298d9a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -315,6 +315,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -317,6 +317,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
      // Main use case currently is for SPIGOT-7487, preventing dropping of leash when leash is removed
      public boolean pluginRemoved = false;
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@@ -51,7 +51,7 @@ index 1d1471aeb0..a7c38c5293 100644
  
      public float getBukkitYaw() {
          return this.yRot;
-@@ -352,6 +358,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -354,6 +360,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
          this.position = Vec3D.ZERO;
          this.blockPosition = BlockPosition.ZERO;
          this.chunkPosition = ChunkCoordIntPair.ZERO;

CraftBukkit-Patches/0012-Metrics.patch

@@ -1,4 +1,4 @@
-From e5a9c1fe2200819bc6cf1ef2190b3d6ca962ac61 Mon Sep 17 00:00:00 2001
+From a5af048b5d24cc6145e4efcc5ea61375b1703f86 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 23 Feb 2013 08:58:35 +1100
 Subject: [PATCH] Metrics

CraftBukkit-Patches/0013-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From 746a033cb776284f16bd9f663caa6a21706aad67 Mon Sep 17 00:00:00 2001
+From 3a7a8366d78b58f41a015c6924cb553fcb920a21 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges

CraftBukkit-Patches/0014-Hopper-Customisations.patch

@@ -1,4 +1,4 @@
-From 9325fad01d4c43a19357744ef971700e474a0b5a Mon Sep 17 00:00:00 2001
+From c81f9a1008a1f3b73bc4460eaf637b0ec78e862a Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Customisations

CraftBukkit-Patches/0015-Allow-Disabling-of-Command-Logging.patch

@@ -1,4 +1,4 @@
-From 6a67af39a1f924c2aff5ef23664da1224e35d9d8 Mon Sep 17 00:00:00 2001
+From 20726b53c9abf27f93c1b42a5a9d987fd4213ffc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging

CraftBukkit-Patches/0016-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,4 +1,4 @@
-From 3771e1ba4f209b25bfe9eb21bb3381bd687dda1d Mon Sep 17 00:00:00 2001
+From eac95ca3d8c5292aef605d31d33fa749a0c45c1d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete

CraftBukkit-Patches/0017-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 6ad0f240600d561f81e9ed6fa1eb5586de383e9b Mon Sep 17 00:00:00 2001
+From 9779a7fcc2118f8d3e1daba7226f7a6bbce6b98a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages

CraftBukkit-Patches/0018-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From 2394afbcc5cc85ce688ba172af5c702ad6cd8b6a Mon Sep 17 00:00:00 2001
+From 20d0392ccd6d18760684b9f730cfbd4ef547c2cb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories

CraftBukkit-Patches/0019-Disallow-Interaction-With-Self.patch

@@ -1,4 +1,4 @@
-From 47a4af45adea397e4f4e1e878ae6e395983b7b79 Mon Sep 17 00:00:00 2001
+From 7a79d71458218f1ce3823a8aa78347962d7ff66b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self

CraftBukkit-Patches/0020-Entity-Mount-and-Dismount-Events.patch

@@ -1,47 +0,0 @@
-From 0511c418be61eaec469daaf5d3e7043665ab8b6d Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Sat, 27 Feb 2016 10:07:58 +1100
-Subject: [PATCH] Entity Mount and Dismount Events
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a7c38c5293..f8255715e0 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2368,6 +2368,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
-                     }
-                 }
-                 // CraftBukkit end
-+                // Spigot start
-+                org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent(this.getBukkitEntity(), entity.getBukkitEntity());
-+                // Suppress during worldgen
-+                if (this.valid) {
-+                    Bukkit.getPluginManager().callEvent(event);
-+                }
-+                if (event.isCancelled()) {
-+                    return false;
-+                }
-+                // Spigot end
-                 if (this.isPassenger()) {
-                     this.stopRiding();
-                 }
-@@ -2455,6 +2465,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
-                 }
-             }
-             // CraftBukkit end
-+            // Spigot start
-+            org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
-+            // Suppress during worldgen
-+            if (this.valid) {
-+                Bukkit.getPluginManager().callEvent(event);
-+            }
-+            if (event.isCancelled()) {
-+                return false;
-+            }
-+            // Spigot end
-             if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
-                 this.passengers = ImmutableList.of();
-             } else {
--- 
-2.43.0
-

CraftBukkit-Patches/0020-Prevent-Ghost-Players-Caused-by-Plugins.patch

@@ -1,4 +1,4 @@
-From da935bfa826297248514b7bb5c297d55254b32a4 Mon Sep 17 00:00:00 2001
+From a441e6dffdd3953064af0d201f687511848dbcc2 Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins

CraftBukkit-Patches/0021-Implement-respawn-API.patch

@@ -1,4 +1,4 @@
-From bdd48a58bfdd1d0b3433bb0b480e54d09bce77e4 Mon Sep 17 00:00:00 2001
+From a3a663224b446cc225e222dd2f7760792fdee915 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.

CraftBukkit-Patches/0022-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 34ea0f633b3d980749c5bae41c0ce2e5bcde1789 Mon Sep 17 00:00:00 2001
+From e30d7f0477611b31587c2f3fb45d8c22a13dfa74 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate

CraftBukkit-Patches/0023-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From f5b68161dc1984f0fb3f6daefc0d7400e22b8f88 Mon Sep 17 00:00:00 2001
+From a47102a46acc5365cc334c9373497f816f23cef7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.

CraftBukkit-Patches/0024-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 480c8c290207b141ed5f90f31eb841aaedb29587 Mon Sep 17 00:00:00 2001
+From b2bb8ee1dd3c7fc9197cef3ca1d197ea5c60f9e3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:23:58 +1000
 Subject: [PATCH] BungeeCord Support

CraftBukkit-Patches/0025-Allow-Disabling-Zombie-Villager-Aggression.patch

@@ -1,4 +1,4 @@
-From 140e08e6815c24ae308d91bd0cfc4f6e43797ac2 Mon Sep 17 00:00:00 2001
+From 91272f5ee70e9a5c45fa094966f4b7cc6a9a3039 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression

CraftBukkit-Patches/0026-Configurable-Amount-of-Netty-Threads.patch

@@ -1,4 +1,4 @@
-From d680247dc1dc2e121bae5567212d6da6f6993e69 Mon Sep 17 00:00:00 2001
+From a4894494c1f290cba94a1d5e8051096f92197712 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads

CraftBukkit-Patches/0027-Save-ticks-lived-to-nbttag.patch

@@ -1,14 +1,14 @@
-From 599bf99f3fda2dd8a376c6c0b68f213a2544e643 Mon Sep 17 00:00:00 2001
+From c12f2c627dd41b0a0a27c0ed5739925e3a2dedea Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f8255715e0..3f6e973f3b 100644
+index 0016298d9a..6f0498a455 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1967,6 +1967,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -1969,6 +1969,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
              if (maxAirTicks != getDefaultMaxAirSupply()) {
                  nbttagcompound.putInt("Bukkit.MaxAirSupply", getMaxAirSupply());
              }
@@ -16,7 +16,7 @@ index f8255715e0..3f6e973f3b 100644
              // CraftBukkit end
              IChatBaseComponent ichatbasecomponent = this.getCustomName();
  
-@@ -2125,6 +2126,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -2127,6 +2128,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
              }
  
              // CraftBukkit start

CraftBukkit-Patches/0028-Add-Option-to-Nerf-Mobs-from-Spawners.patch

@@ -1,4 +1,4 @@
-From c9c1547cc6504302c4aaab66e84df374fd8e78be Mon Sep 17 00:00:00 2001
+From 8b0577e42a67420e77e82174fdc8df6f94ece1f9 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawners

CraftBukkit-Patches/0029-Allow-statistics-to-be-disabled-forced.patch

@@ -1,4 +1,4 @@
-From 6ff10c3d8428769854cd368dfcef1c572ab6adcc Mon Sep 17 00:00:00 2001
+From e6661833577bbfae7095ee97cb58858206cdc574 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced

CraftBukkit-Patches/0030-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch

@@ -1,4 +1,4 @@
-From 5eaa0dbed2fff5fed913fa6053a2adc48891a4c5 Mon Sep 17 00:00:00 2001
+From bebdd63fa7be4e0c7e243e94fce226c7aee5da2b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:44:07 +1100
 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.

CraftBukkit-Patches/0031-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch

@@ -1,4 +1,4 @@
-From 53c1feaeff927233b952e9af3169fee2f34d8c60 Mon Sep 17 00:00:00 2001
+From 9b60aeae341ba363283ba68a35abdf6ee81cf154 Mon Sep 17 00:00:00 2001
 From: Dmck2b <dmck2b+github@gmail.com>
 Date: Mon, 20 Jan 2014 20:18:23 +0000
 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks

CraftBukkit-Patches/0032-Highly-Optimized-Tick-Loop.patch

@@ -1,4 +1,4 @@
-From ebff4636d69b1dadfa24bb0bffcf282420d3974f Mon Sep 17 00:00:00 2001
+From 957e53adef4fc2a57275ee94015d4ddebc3c5406 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 26 Jan 2017 21:50:51 +0000
 Subject: [PATCH] Highly Optimized Tick Loop

CraftBukkit-Patches/0033-Configurable-Ping-Sample-Size.patch

@@ -1,4 +1,4 @@
-From ac0b6f55e4abce61fa527e568b8eb3d3f2f5876d Mon Sep 17 00:00:00 2001
+From c9ddbfb8a2e6ac4ed2ddfaa053035c85783183fd Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 26 Jan 2014 21:48:34 +1100
 Subject: [PATCH] Configurable Ping Sample Size

CraftBukkit-Patches/0034-Add-Optional-Tick-Shuffling.patch

@@ -1,4 +1,4 @@
-From 3e688e9d57a1361d0f899855d90d21ca7d5f318b Mon Sep 17 00:00:00 2001
+From f9ef6a078e854ac8db6e0b37695736376032d1ef Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 27 Jan 2014 08:39:26 +1100
 Subject: [PATCH] Add Optional Tick Shuffling

CraftBukkit-Patches/0035-Spam-Filter-Exclusions.patch

@@ -1,4 +1,4 @@
-From f2908929616bf0c62463326b4b98c15a580f2755 Mon Sep 17 00:00:00 2001
+From 6d63cd0f77b1bac61b16d4ee1c0c9323a6c61ef2 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions

CraftBukkit-Patches/0036-Add-Option-to-Silence-CommandBlock-Console.patch

@@ -1,4 +1,4 @@
-From 82b0d0a1b96fde28b64e3a3769d9cf88682b50a1 Mon Sep 17 00:00:00 2001
+From 88faa83240e62f9a6e79127a324e00f6e0bae64f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 9 Feb 2014 14:39:01 +1100
 Subject: [PATCH] Add Option to Silence CommandBlock Console

CraftBukkit-Patches/0037-Add-support-for-fetching-hidden-players.patch

@@ -1,4 +1,4 @@
-From 15a0a627d208892c817ba407f1f6d9df75617369 Mon Sep 17 00:00:00 2001
+From b9d739efc74c09d83d3dd02ea0d4c059f7cb5a1a Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players

CraftBukkit-Patches/0038-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch

@@ -1,4 +1,4 @@
-From 6e83636d08607de98b6f59d8fd2fa51682446533 Mon Sep 17 00:00:00 2001
+From cd493b14655eaa7df6c4c72d99ef7729b24bc682 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command

CraftBukkit-Patches/0039-Implement-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From da37155ec0ad4a589c9aabf582801417559ba62c Mon Sep 17 00:00:00 2001
+From 733711eea01b4287a7fff6f57f0e24d17bb8216d Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API

CraftBukkit-Patches/0040-Configurable-dragon-death-and-wither-spawn-sounds.patch

@@ -1,4 +1,4 @@
-From 4312151421d9aa461736598f6533eaa12bed7486 Mon Sep 17 00:00:00 2001
+From a0a3f4cabbf582b51233b0d46b9401e7f79965ea Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 29 Mar 2014 13:44:25 -0400
 Subject: [PATCH] Configurable dragon death and wither spawn sounds

CraftBukkit-Patches/0041-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch

@@ -1,4 +1,4 @@
-From bcf372f9680f49779ac3bd34aff6469eaa858f4c Mon Sep 17 00:00:00 2001
+From 88c5beee6cf4187c1929d8807136bed3d3273122 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 11 Apr 2014 11:16:34 +0100
 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang

CraftBukkit-Patches/0042-Print-Stack-on-InternalException.patch

@@ -1,4 +1,4 @@
-From e25ddb4b1e621af6916b7cbb386410ab65201d2b Mon Sep 17 00:00:00 2001
+From 0d90202ec8752e0f248b1d50a831029dad77a2b4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 09:00:59 +1000
 Subject: [PATCH] Print Stack on InternalException

CraftBukkit-Patches/0043-Use-Offline-Player-Data-Once-if-Required.patch

@@ -1,4 +1,4 @@
-From 1c93d2fc0d079d7a669725164e19fb93952be807 Mon Sep 17 00:00:00 2001
+From 1b16ac6bbd18d8193a16efbdf9bf3023afd3bd05 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 14:41:23 +1000
 Subject: [PATCH] Use Offline Player Data Once if Required.

CraftBukkit-Patches/0044-Fix-Player-Banning.patch

@@ -1,4 +1,4 @@
-From 5c1e51034625d04fb81980a7ea90cbb6495e1eea Mon Sep 17 00:00:00 2001
+From 7f8943fa0ad3d1f2385fbdccbc24f9b2fc3e3a2a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:32:48 +1000
 Subject: [PATCH] Fix Player Banning

CraftBukkit-Patches/0045-Prevent-NoClassDefError-crash-and-notify-on-crash.patch

@@ -1,4 +1,4 @@
-From e6a9304aa17f2f00b4838bb2c6edcf33629070e5 Mon Sep 17 00:00:00 2001
+From f1bae9bbf7f0cdc13e5091b0185922d89ccc4132 Mon Sep 17 00:00:00 2001
 From: David <dmck2b@gmail.com>
 Date: Mon, 21 Apr 2014 12:43:08 +0100
 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash

CraftBukkit-Patches/0046-Fix-race-condition-that-could-kill-connections-befor.patch

@@ -1,4 +1,4 @@
-From 47fedc3d8f7d30cd5e33e894d69c537485da11a5 Mon Sep 17 00:00:00 2001
+From 1c871bf2920f3e6c984cac95c0bcbd9752898ed4 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 25 Apr 2014 23:46:46 +0200
 Subject: [PATCH] Fix race condition that could kill connections before they

CraftBukkit-Patches/0047-Configurable-UserCache-cap.patch

@@ -1,4 +1,4 @@
-From 6a04e1123bafb6dc2465519e3d3a5ae4267ebed4 Mon Sep 17 00:00:00 2001
+From 5f38fbd456e8ce6f0c102f790151b0c22b73a0fb Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 25 Apr 2014 18:17:30 -0400
 Subject: [PATCH] Configurable UserCache cap

CraftBukkit-Patches/0048-Implement-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From 0d8f87085b395884d9fc0b2ac5b4e671927d4a25 Mon Sep 17 00:00:00 2001
+From 1eed7256f8dcb26f279021adeab4733b29e802dc Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:05:19 +0200
 Subject: [PATCH] Implement PlayerSpawnLocationEvent.

CraftBukkit-Patches/0049-Configurable-save-on-stop-only-for-UserCache.patch

@@ -1,4 +1,4 @@
-From 218e62d9f0e12a2990f9474fa6e3bb1d774afa2e Mon Sep 17 00:00:00 2001
+From 044886ed6f86e4e75a1b9c98f8e38924cc039a24 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache

CraftBukkit-Patches/0050-Limit-block-placement-interaction-packets.patch

@@ -1,4 +1,4 @@
-From e88e7d5e3727841b8e93e5f9cc38eb4432189562 Mon Sep 17 00:00:00 2001
+From c91933f0a817933c155ad8cf808409e3c442f4bc Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets

CraftBukkit-Patches/0051-Better-item-validation.patch

@@ -1,4 +1,4 @@
-From a95d74ff75cf4716560840d5d7f4cfddb4bc4ad0 Mon Sep 17 00:00:00 2001
+From 02fc0bf9c7ebb8c72dcd21ae97cbbdc75acb651f Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation

CraftBukkit-Patches/0052-Further-Seed-Customisation.patch

@@ -1,4 +1,4 @@
-From 8169beefd7ddabe99d7310195f07d50bed3a6efc Mon Sep 17 00:00:00 2001
+From 086dd4975ad6c935b756e3e989909c20e5bf4a87 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation

CraftBukkit-Patches/0053-Safer-JSON-Loading.patch

@@ -1,4 +1,4 @@
-From c96b4208ae88c20ec181d428811ccb60188da03a Mon Sep 17 00:00:00 2001
+From 92661ae8fc9205e927ef6028925a6be1595b57ce Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 8 Jul 2014 09:44:18 +1000
 Subject: [PATCH] Safer JSON Loading

CraftBukkit-Patches/0054-Add-CommandLine-EULA-Flag.patch

@@ -1,4 +1,4 @@
-From cb0ab1aea6ac20a8c8fd9714532fa0a2528b4008 Mon Sep 17 00:00:00 2001
+From fd7aa62110c6fab820a8c965e1d3c635b0c29dcc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 9 Jul 2014 10:35:44 +1000
 Subject: [PATCH] Add CommandLine EULA Flag

CraftBukkit-Patches/0055-Prevent-a-crash-involving-attributes.patch

@@ -1,4 +1,4 @@
-From 07f03eae27a777eaf3a619737614da4ad414e914 Mon Sep 17 00:00:00 2001
+From 7c25c7601db184dd02e542c4a0e03403ddb78e54 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes

CraftBukkit-Patches/0056-Make-moved-wrongly-limit-configurable.patch

@@ -1,4 +1,4 @@
-From e586354ed1a42e8b4160f670553d7ce460ed412a Mon Sep 17 00:00:00 2001
+From b30e76ae275624d05f07179a23d053ae059f6569 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable

CraftBukkit-Patches/0057-Make-moved-too-quickly-limit-configurable.patch

@@ -1,4 +1,4 @@
-From 151aef123be861bbd25eb1f21b3927a8eb5028e2 Mon Sep 17 00:00:00 2001
+From 84bb517d6bc74293bf62dfe3d25847a0ab0139df Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable

CraftBukkit-Patches/0058-Apply-NBTReadLimiter-to-more-things.patch

@@ -1,4 +1,4 @@
-From 2c5220b02c76dab3aefeb15714dbae86c9c9ecd8 Mon Sep 17 00:00:00 2001
+From d57d2287f87345cf92238707fd78cdb94ce868b7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 27 Jul 2014 20:46:04 +1000
 Subject: [PATCH] Apply NBTReadLimiter to more things.

CraftBukkit-Patches/0059-Allow-Attribute-Capping.patch

@@ -1,4 +1,4 @@
-From bba9973fd6607483436f5077143d71f9ea8098d0 Mon Sep 17 00:00:00 2001
+From 6f496ce812b7bd3e6ee6a9545a317a8b4759fa47 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 28 Jul 2014 16:55:51 +1000
 Subject: [PATCH] Allow Attribute Capping.

CraftBukkit-Patches/0060-Plug-WorldMap-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From 3031ce8f4ca567e122e5c4429cb034b6bfb69ae3 Mon Sep 17 00:00:00 2001
+From cdda93c3ae3fc335a170173706b8f89ede30497a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 8 Aug 2014 19:57:03 +1000
 Subject: [PATCH] Plug WorldMap Memory Leak

CraftBukkit-Patches/0061-Add-Hunger-Config-Values.patch

@@ -1,4 +1,4 @@
-From 7fb2bf607329dcbe61c68ba717ec0cad95839a33 Mon Sep 17 00:00:00 2001
+From 01d719658ca834d025c832c0bb0d7a4299e40d18 Mon Sep 17 00:00:00 2001
 From: lazertester <austin.techhead@gmail.com>
 Date: Sun, 17 Aug 2014 19:56:17 +1000
 Subject: [PATCH] Add Hunger Config Values

CraftBukkit-Patches/0062-Make-debug-logging-togglable.patch

@@ -1,4 +1,4 @@
-From 9f480bf0d7537adbf603a36c9683278f3aae5052 Mon Sep 17 00:00:00 2001
+From 01be14cbbe4eae471da86d03955dda9885eb11fc Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sun, 17 Aug 2014 12:42:53 +0200
 Subject: [PATCH] Make debug logging togglable.

CraftBukkit-Patches/0063-Limit-TNT-Detonations-per-tick.patch

@@ -1,4 +1,4 @@
-From 77e2a9765f8e551acbb57c943cef40acbcb9efaa Mon Sep 17 00:00:00 2001
+From b135dc73afcf90ce540e61efcb46dc27aa727f41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Aug 2014 18:12:32 -0400
 Subject: [PATCH] Limit TNT Detonations per tick

CraftBukkit-Patches/0064-Configurable-Hanging-Tick.patch

@@ -1,4 +1,4 @@
-From c9fe9d1ae342807cac4727f481cd8234ee2ffb80 Mon Sep 17 00:00:00 2001
+From 845e5c0f03dde3cf6a073c4e8fbd663a8c68627a Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Sat, 9 Aug 2014 13:56:51 -0400
 Subject: [PATCH] Configurable Hanging Tick

CraftBukkit-Patches/0065-BungeeCord-Chat-API.patch

@@ -1,4 +1,4 @@
-From 77224e40444b695e3da25d813795b14abf3f729e Mon Sep 17 00:00:00 2001
+From 5591dd91ba91c3e8f5358d97df11897a2c2fc1f2 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 03:06:05 +0100
 Subject: [PATCH] BungeeCord Chat API

CraftBukkit-Patches/0066-Allow-Capping-Tile-Entity-Tick-Time.patch

@@ -1,4 +1,4 @@
-From a976338b25332176c6599f046262b495308ef40d Mon Sep 17 00:00:00 2001
+From 66ef412e806373c7c56593cf87df5b06bee4e463 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:39:31 +1100
 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.

CraftBukkit-Patches/0067-Use-Map-for-getPlayer-String-lookup.patch

@@ -1,4 +1,4 @@
-From 989561a4766ae26ac302ef8150f2bc5ce6cf6012 Mon Sep 17 00:00:00 2001
+From b68e3d49e4d2b67dadff08bfccd6db50a127132d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 13 Jul 2015 19:05:15 +1000
 Subject: [PATCH] Use Map for getPlayer(String) lookup.

CraftBukkit-Patches/0068-Clear-Packet-Queue-on-Disconnect.patch

@@ -1,4 +1,4 @@
-From e6c2f33400c48338fccef82f2a8225d8e157bc05 Mon Sep 17 00:00:00 2001
+From fe1b25338976f7196c00a8defc0aaaef993b3b8c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 22 Jul 2015 19:04:37 +1000
 Subject: [PATCH] Clear Packet Queue on Disconnect

CraftBukkit-Patches/0069-Configurable-Advancement-Disabling.patch

@@ -1,4 +1,4 @@
-From 7d938577a878641aa6a6378838cf4d3de9b3de44 Mon Sep 17 00:00:00 2001
+From b2c27b1500a31571ad82fcb19ff70b9bea997468 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 9 Jun 2017 16:29:31 +1000
 Subject: [PATCH] Configurable Advancement Disabling

CraftBukkit-Patches/0070-Add-creative-mode-NBT-permissions.patch

@@ -1,4 +1,4 @@
-From a7e202b504db6babf75b9fa6bbb8da83c860a0b1 Mon Sep 17 00:00:00 2001
+From 981ab14eb8d01ae2e02b1a4c3cc7bae32bda1829 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 25 Feb 2019 19:26:56 +1100
 Subject: [PATCH] Add creative mode NBT permissions

CraftBukkit-Patches/0071-Remove-DataWatcher-Locking.patch

@@ -1,4 +1,4 @@
-From 11f70aa4f6ef7d2e68f940babac5af56eaaf80f5 Mon Sep 17 00:00:00 2001
+From a225861b0ebcdff9422a06296aeaf20bd492f831 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 9 Jul 2019 02:18:54 -0700
 Subject: [PATCH] Remove DataWatcher Locking
@@ -122,10 +122,10 @@ index ac10ddf352..78d4756490 100644
  
          this.entity.onSyncedDataUpdated(list);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3f6e973f3b..5e15c69863 100644
+index 6f0498a455..1d3d2512ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -375,6 +375,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
+@@ -377,6 +377,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
          this.entityData.define(Entity.DATA_POSE, EntityPose.STANDING);
          this.entityData.define(Entity.DATA_TICKS_FROZEN, 0);
          this.defineSynchedData();

CraftBukkit-Patches/0072-Allow-Reading-Old-Large-Chunks.patch

@@ -1,4 +1,4 @@
-From 5eaf6d24cf30c609f6e11adffd9c4c2726789238 Mon Sep 17 00:00:00 2001
+From 97b71dd0e68b5f7490b446d3fb19bdfb79246fc2 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 19 Feb 2019 22:30:00 +1100
 Subject: [PATCH] Allow Reading Old Large Chunks

CraftBukkit-Patches/0073-Add-log-villager-deaths-option.patch

@@ -1,4 +1,4 @@
-From 58e0020741636784e86a1632bc11e3badac7f151 Mon Sep 17 00:00:00 2001
+From 4e616dd36a779be148c5a1a0ffced5be23f0af73 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 14 Dec 2019 10:26:52 +1100
 Subject: [PATCH] Add log-villager-deaths option

CraftBukkit-Patches/0074-Allow-Disabling-Player-Data-Saving.patch

@@ -1,4 +1,4 @@
-From cce5ac2f61640485b6c2fff95d1411401e938c40 Mon Sep 17 00:00:00 2001
+From af454fea1e425084a30b8ddd6ef208c1e353a7e9 Mon Sep 17 00:00:00 2001
 From: Sander Knauff <sanderknauff@hotmail.com>
 Date: Sat, 7 Nov 2020 18:23:42 +1100
 Subject: [PATCH] Allow Disabling Player Data Saving

CraftBukkit-Patches/0075-Configurable-Thunder-Chance.patch

@@ -1,4 +1,4 @@
-From d5058c0505e7697f014536a0290ee8bc73fd8414 Mon Sep 17 00:00:00 2001
+From d831e16c18c73ecb052e6228547ff50ac0d7225f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 24 Oct 2021 20:29:25 +1100
 Subject: [PATCH] Configurable Thunder Chance

CraftBukkit-Patches/0076-Configurable-Below-Zero-Generation.patch

@@ -1,4 +1,4 @@
-From deff675870765aa511328ddbad8ef886f511767d Mon Sep 17 00:00:00 2001
+From c6b4c653d4f362532260926e1eefca838f5ca2a5 Mon Sep 17 00:00:00 2001
 From: DerFrZocker <derrieple@gmail.com>
 Date: Sun, 28 Nov 2021 12:09:29 +1100
 Subject: [PATCH] Configurable Below Zero Generation