More involved workaround for vehicle event cancellation

Spigot-Server-Patches/0060-Made-EntityDismountEvent-Cancellable.patch

@@ -1,29 +0,0 @@
-From 031f1df60d5934708755d7afe14817d30fdf8b4d Mon Sep 17 00:00:00 2001
-From: Nik Gil <nikmanG@users.noreply.github.com>
-Date: Thu, 3 Mar 2016 04:04:19 -0600
-Subject: [PATCH] Made EntityDismountEvent Cancellable
-
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 782abd6..b15c5f6 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1741,7 +1741,14 @@ public abstract class Entity implements ICommandListener {
-                 }
-             }
-             // CraftBukkit end
--            Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
-+            // Paper start - make EntityDismountEvent cancellable
-+            if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) {
-+                if (entity instanceof EntityPlayer) {
-+                    ((EntityPlayer) entity).playerConnection.sendPacket(new net.minecraft.server.PacketPlayOutMount(this));
-+                }
-+                return;
-+            }
-+            // Paper end
-             this.passengers.remove(entity);
-             entity.j = 60;
-         }
--- 
-2.8.0
-

Spigot-Server-Patches/0060-Optimize-Pathfinding.patch

@@ -1,4 +1,4 @@
-From b83dba2e70f1396521b6b36f57f2d63753ed73e7 Mon Sep 17 00:00:00 2001
+From 4657a4ff4a1209fd56404f3768f6a566c0c27bc6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding

Spigot-Server-Patches/0061-Optimize-getBlockData.patch

@@ -1,4 +1,4 @@
-From 80bdfb8b3bf944ed05a1c28816568bde9e05709c Mon Sep 17 00:00:00 2001
+From 1d994e981c808ec7253ff3ed4f4020b41829510b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize getBlockData

Spigot-Server-Patches/0062-Avoid-hopper-searches-if-there-are-no-items.patch

@@ -1,4 +1,4 @@
-From 4b2dc270961fdd134dd221d6467e838fbdddf3a4 Mon Sep 17 00:00:00 2001
+From 34c7679b3d20769bbaeba17d3ee50ad87bde447a Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items

Spigot-Server-Patches/0063-Expose-server-CommandMap.patch

@@ -1,4 +1,4 @@
-From 5bde9bfcd1cd72d14b7aafcf5f2591a93df7cf25 Mon Sep 17 00:00:00 2001
+From bd9643d3d3db14bda339720f3d3cebdf85c7dfed Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap

Spigot-Server-Patches/0064-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,4 +1,4 @@
-From 61c9bda0f6b7c28ddf1b0d2fc158b8ade028ca57 Mon Sep 17 00:00:00 2001
+From 198a36dc466f7b186affe2c3dc4bb79cf9704f18 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception

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

@@ -1,4 +1,4 @@
-From 5ed9efdda2a3086f7529b0b0eb9df4aeff1fdeed Mon Sep 17 00:00:00 2001
+From 9299fe5f4a331e55ad997054df153d7b0545a354 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses

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

@@ -1,4 +1,4 @@
-From 758ec740cf5321bae414b79cec8b3c32000be1eb Mon Sep 17 00:00:00 2001
+From 964288fa89c51ce6bbbb01d45e162cad746f1af0 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs

Spigot-Server-Patches/0067-Ensure-inv-drag-is-in-bounds.patch

@@ -1,4 +1,4 @@
-From f17a8ae4a73cef2e4c35c92919eff663938aac22 Mon Sep 17 00:00:00 2001
+From 582fe24787f872e73de369a7bca5b2a8d3fe0bbf Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds

Spigot-Server-Patches/0068-Change-implementation-of-tile-entity-removal-list.patch

@@ -1,11 +1,11 @@
-From 84fb7750d13c260f07760685068b41c5dc912f3b Mon Sep 17 00:00:00 2001
+From 29c4559ebd61234ff7e07ea49d2f014572cc7434 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c3e6588..5ff5c54 100644
+index 782abd6..df49185 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -119,9 +119,9 @@ public abstract class Entity implements ICommandListener {

Spigot-Server-Patches/0069-Add-configurable-portal-search-radius.patch

@@ -1,4 +1,4 @@
-From e2ad3d929d3a20da24373bcb2a50363d8bd404e9 Mon Sep 17 00:00:00 2001
+From b1c322aa34ad6d5802705dbcd0613330bd0da7cd Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius

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

@@ -1,4 +1,4 @@
-From d6c51d8cff479bbb46e78b7dd5808e7a5c59d2b1 Mon Sep 17 00:00:00 2001
+From 757a12b52c7aaab1cb9482e27ccc2c0b794707ca Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings

Spigot-Server-Patches/0071-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From d159723b249d0e0adefa9711eb5e6b96fcf8edf2 Mon Sep 17 00:00:00 2001
+From cf7e3abb7603715b6e7580ac89fe45bd1bfbaa94 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches

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

@@ -1,4 +1,4 @@
-From f4e4e69cd47607767872a6b9ab976abd535fab93 Mon Sep 17 00:00:00 2001
+From d54ccf5e32ba24202f54270f93c2fc760144844b Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event

Spigot-Server-Patches/0073-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From 4cf0665023385a111f16d8f9d2407c739be84a63 Mon Sep 17 00:00:00 2001
+From 625ae497ed404e57797c88a005ca4fc2246312c7 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 7 Mar 2016 12:51:01 -0700
 Subject: [PATCH] Speedup BlockPos by fixing inlining

Spigot-Server-Patches/0074-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,4 +1,4 @@
-From a3a785b6ceb2e53bf5bbf386a676ee4dedee1647 Mon Sep 17 00:00:00 2001
+From 2c51fa98a30040a704cb0bd0c25b90a2e97a9b65 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text

Spigot-Server-Patches/0075-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 5f3dd9383f6ea18ea59df19c28d68bea36d87d98 Mon Sep 17 00:00:00 2001
+From 418f131fc4357962762b01fc1fe80f982ec5ae57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -37,10 +37,10 @@ index b044f33..1758a56 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fc4d72f..14ab2da 100644
+index df49185..26f83a4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1852,6 +1852,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1845,6 +1845,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public ScoreboardTeamBase aO() {

Spigot-Server-Patches/0076-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,11 +1,11 @@
-From 0fddc1a09c703603800f97ab99b4c2ccc566782d Mon Sep 17 00:00:00 2001
+From d558be34000c9c6dd375cfca27aeb4a46d9719f0 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 017377e..22d5fe6 100644
+index 342fcb7..d0e0285 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1279,10 +1279,12 @@ public abstract class EntityLiving extends Entity {

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

@@ -1,4 +1,4 @@
-From 0e87b48ebafeb6b0052653e9c685adbfbf526482 Mon Sep 17 00:00:00 2001
+From 5518d351aa3f9110c4c57fd5869cb88105a37d02 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API

Spigot-Server-Patches/0078-Re-add-Spigot-s-hopper-check-feature.patch

@@ -1,4 +1,4 @@
-From 35f4f999fb757889ec74b2ad15f51eb920c87395 Mon Sep 17 00:00:00 2001
+From cae272d18fd6dd6b36b9c1181c9ed71437cbf049 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature

Spigot-Server-Patches/0079-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From c5a2e980720023ddce60554a2280e1ea7a89f191 Mon Sep 17 00:00:00 2001
+From 9b18e4094e553dec3e3002481683d86634c5bb77 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements

Spigot-Server-Patches/0080-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From fe99af7b10b4fa0168b15e93249fdf4b3a8b2aff Mon Sep 17 00:00:00 2001
+From 5e3ee00d4e1e65831e2356ea1f002592eaca235c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt

Spigot-Server-Patches/0081-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From ced795e7ce5a5d065cda466a5579403c1029e793 Mon Sep 17 00:00:00 2001
+From 1c7068f7ff86e1869beef899066ed3af8e148ffe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,7 +30,7 @@ index 2a391d5..2db9fc0 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 53bfbc4..8ffc06b 100644
+index b6be0d7..5b91630 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0082-Allow-Reloading-of-Custom-Permissions.patch

@@ -1,4 +1,4 @@
-From baab12e28aa5f7507d3c3ca7493ca47354c39117 Mon Sep 17 00:00:00 2001
+From 72b98822da639bded14883f59a498781b64b9b0a Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -32,5 +32,5 @@ index 5b91630..20a8ef7 100644
 +    // Paper end
  }
 -- 
-2.5.0
+2.8.0
 

Spigot-Server-Patches/0083-Remove-Metadata-on-reload.patch

@@ -1,4 +1,4 @@
-From 6a0d65b570ee34d0e746dbc30baf0aef76809944 Mon Sep 17 00:00:00 2001
+From 96f359acc90ad1aaa25693823ede270720e1536b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 29244e1..9ed9fbb 100644
+index 20a8ef7..e957ed0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -729,6 +729,14 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0084-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 2de7f35a9929145e900262fcde536f0de84e34b0 Mon Sep 17 00:00:00 2001
+From 5cd56ddfbdeb8580836f02e4d2772b4178b2808e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing

Spigot-Server-Patches/0085-Fix-Furnace-cook-time-bug.patch

@@ -1,4 +1,4 @@
-From da9640438b63bf852b255d167081b5bf7d037a23 Mon Sep 17 00:00:00 2001
+From c133d093e615cd8f520eede3730556d0f5b9de2d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug

Spigot-Server-Patches/0086-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From 811beb27ad4f6c5df7d3d3f3beb2e29f861c254b Mon Sep 17 00:00:00 2001
+From 34c1a61289abe53d331216702a4539b603cd087f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies

Spigot-Server-Patches/0087-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From c5e8057ca0d583db8809136a623f5d71d605baf4 Mon Sep 17 00:00:00 2001
+From 28d8d3671fcdb920d2db55fb577165fa4744485b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate

Spigot-Server-Patches/0088-Optimize-BlockStateList-BlockData.patch

@@ -1,4 +1,4 @@
-From f7313e6dc75314c8ebe99a130f1cab8a31b48138 Mon Sep 17 00:00:00 2001
+From 814a896e78a4fe3b368da81bcc802d4d5a8c3475 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 19:15:44 -0400
 Subject: [PATCH] Optimize BlockStateList/BlockData

Spigot-Server-Patches/0089-Add-World-Util-Methods.patch

@@ -1,4 +1,4 @@
-From a73a37ed1c7987b84c1fe0b8f033c72ababd0d43 Mon Sep 17 00:00:00 2001
+From c419a39f39a2a3da3d3577732389060d61da3e2d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods

Spigot-Server-Patches/0090-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From 58cdfccf5ed3401d652bcbbc099103b7f19141ff Mon Sep 17 00:00:00 2001
+From 04e183d8f5d331f32c94cc1ac26403ce75021c40 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons

Spigot-Server-Patches/0091-Pass-world-to-Village-creation.patch

@@ -1,4 +1,4 @@
-From 3ad8d8205d1a7ca14c8062a4544fe6072e1bfd61 Mon Sep 17 00:00:00 2001
+From dc0d3dd73071c17da61f90d233b070cca91d1896 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation

Spigot-Server-Patches/0092-Custom-replacement-for-eaten-items.patch

@@ -1,11 +1,11 @@
-From aadeb2d70ff7f53406caf5b8299dbdb1cc59d011 Mon Sep 17 00:00:00 2001
+From 4511d316f0f42453229c665f35314a0f6f326844 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 22d5fe6..e6fb045 100644
+index d0e0285..f6d615d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2223,12 +2223,25 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/0093-Set-health-before-death-event.patch

@@ -1,4 +1,4 @@
-From 8c29971e2b222a7cbe7d0d9d48a99cc0fa129b58 Mon Sep 17 00:00:00 2001
+From f6edde451ecadd4f41583595b682e155e8c75793 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event

Spigot-Server-Patches/0094-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From 7e7eac78fd972d1a9578240ca6e5fd4f09734cec Mon Sep 17 00:00:00 2001
+From 9b89e5288e36a7a809bc9e9b40d03d86064145af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e6fb045..5ec4cd8 100644
+index f6d615d..41b63ce 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -464,7 +464,13 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/0095-Catch-Async-PlayerChunkMap-operations.patch

@@ -1,4 +1,4 @@
-From 7eb979e9d6b597bf3c472b06ada7e24ceb7b587f Mon Sep 17 00:00:00 2001
+From 25599d1fbdd4d7a7098bb0b3c2d2d685ea27113c Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations

Spigot-Server-Patches/0096-Support-offline-mode-in-whitelist-command-as-well.patch

@@ -1,4 +1,4 @@
-From ead9fa41adb7c620a593dac005223c01453252c4 Mon Sep 17 00:00:00 2001
+From 56776fc29d5d9123c509a475dd48816f146a12fb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well

Spigot-Server-Patches/0097-Optimize-Chunk-Unload-Queue.patch

@@ -1,4 +1,4 @@
-From 1cd7e2932293b05351c6d063b308e7d75f473346 Mon Sep 17 00:00:00 2001
+From 98038d95d620e9e2b39bc0ee44ee99062e4cfc89 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 17:57:25 -0400
 Subject: [PATCH] Optimize Chunk Unload Queue

Spigot-Server-Patches/0098-Fix-SkullCache-case-bug.patch

@@ -1,4 +1,4 @@
-From 562833b7751f03dfd07a8ee84c4a689cf8a83add Mon Sep 17 00:00:00 2001
+From fa8ed798c503fad1bf1923b8aeae5600b0f5ffb4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug

Spigot-Server-Patches/0099-Waving-banner-workaround.patch

@@ -1,4 +1,4 @@
-From 75ad0da281d8a214aec8932689fe42abf0eebb67 Mon Sep 17 00:00:00 2001
+From 5ffcb31f77910f978176bfe04aebadca9bce086b Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround

Spigot-Server-Patches/0100-Use-a-Shared-Random-for-Entities.patch

@@ -1,4 +1,4 @@
-From 17199e7d96753b3ff9afe62bbd9e821c46807460 Mon Sep 17 00:00:00 2001
+From 88fc0caa74e98940c4eba838d38edc280fa70c3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f9626d6..4a4fe34 100644
+index 26f83a4..8484557 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -44,6 +44,7 @@ public abstract class Entity implements ICommandListener {

Spigot-Server-Patches/0101-Don-t-teleport-dead-entities.patch

@@ -1,4 +1,4 @@
-From 8a8060df1836f7082b54b4fda091c10e1cefd2d6 Mon Sep 17 00:00:00 2001
+From 5dcb2f283bcc67ce8651bebcdda425b7f0ca54af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8c26c0e..1bc39f5 100644
+index 8484557..c0b0a26 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2102,7 +2102,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2095,7 +2095,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public Entity teleportTo(Location exit, boolean portal) {

Spigot-Server-Patches/0102-Optimize-Chunk-Access.patch

@@ -1,4 +1,4 @@
-From 6664feff232eb242497638d4c014f9d3b3dfbba9 Mon Sep 17 00:00:00 2001
+From 244e2b525225427d739ef28b12dbe63c819e1d38 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -29,7 +29,7 @@ index ac35cf4..6e3d17b 100644
  
          for (int k = 0; k < this.entitySlices.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index f5a2580..5ec5bf6 100644
+index 4d0653c..9863126 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -24,7 +24,26 @@ public class ChunkProviderServer implements IChunkProvider {

Spigot-Server-Patches/0103-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,4 +1,4 @@
-From 8b2dc36b364deaeb37048254d6c1a500deffb766 Mon Sep 17 00:00:00 2001
+From 7514fb16d9d7af9eced7dcf8a700bf4300c45bf4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -19,7 +19,7 @@ index 26c1b72..55b211e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 47dbea8..0acce3e 100644
+index df7a807..3d25fd4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -428,7 +428,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/0104-Optimize-isValidLocation-for-inlining.patch

@@ -1,4 +1,4 @@
-From 62e3299a5f3113b0d4ccbc3809df6c1cf717f8a7 Mon Sep 17 00:00:00 2001
+From a1ce47735d51010521d0296781abf0ba013c607e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 23:41:34 -0400
 Subject: [PATCH] Optimize isValidLocation for inlining

Spigot-Server-Patches/0105-Use-correct-item-in-arrow-pickup-event.patch

@@ -1,4 +1,4 @@
-From e793e612060ceb1d4265673b2c526697e86ed707 Mon Sep 17 00:00:00 2001
+From 7441dbd863529b28257040f5842f9b623ca10518 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 22 Mar 2016 16:00:16 -0400
 Subject: [PATCH] Use correct item in arrow pickup event

Spigot-Server-Patches/0106-Fix-cooked-fish-legacy-import.patch

@@ -1,4 +1,4 @@
-From e2031b7f38af9ba162886a5d0aefcf1d9a58c8da Mon Sep 17 00:00:00 2001
+From 1cdeef4af311224fad86305e246823361b0c0bd3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import

Spigot-Server-Patches/0107-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch

@@ -1,4 +1,4 @@
-From b1d3a534902a697200c83cdfd1d51722538c4e0a Mon Sep 17 00:00:00 2001
+From d15a3cf34425bd827a34858e997784ed9496f9b7 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sat, 26 Mar 2016 21:36:05 -0500
 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator

Spigot-Server-Patches/0108-Access-items-by-EquipmentSlot.patch

@@ -1,4 +1,4 @@
-From 3175e1d498f0b2797c51412423cff8b439ae4ec8 Mon Sep 17 00:00:00 2001
+From 26eb2568487b8197e971ca7a0515fedf3c7d8ac1 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot

Spigot-Server-Patches/0109-Check-async-remove-unused-vars-GH-159.patch

@@ -1,4 +1,4 @@
-From 8cea438f7c32fcc261b8fefc5fd055cfb75d6700 Mon Sep 17 00:00:00 2001
+From be3b16091990054599b189b468ba939c8f872899 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159

Spigot-Server-Patches/0110-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch

@@ -1,4 +1,4 @@
-From ec3841938504ccc00a8eae4f4c833b4ef14cb4f7 Mon Sep 17 00:00:00 2001
+From de54050b13b340287834e5e72b96a2c8e7834117 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone

Spigot-Server-Patches/0111-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,4 +1,4 @@
-From a2fa5524eef6d94c5796dc1860729b9e0433aabf Mon Sep 17 00:00:00 2001
+From 3de12d90f6a0a8a0057720a0888c21197ceced20 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events

Spigot-Server-Patches/0112-Configurable-Chunk-Inhabited-Timer.patch

@@ -1,4 +1,4 @@
-From 189ab6d189fc1da09850d78eedf8ed705738c54d Mon Sep 17 00:00:00 2001
+From 146e00cc32b1571676f6f0a66c3a6363867967b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer

Spigot-Server-Patches/0113-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From e223839dc07c768f1f76ed0fa5aa0b27c0fd0173 Mon Sep 17 00:00:00 2001
+From 76f9f85d4fe58407a75d6dc4d927fc430af22e97 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent

Spigot-Server-Patches/0114-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch

@@ -1,4 +1,4 @@
-From f2035042805b5f7b9844412adfa13512b2a9ed53 Mon Sep 17 00:00:00 2001
+From 6242fcfdbb4e0fbbf4a9604a544377c980e9108a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks

Spigot-Server-Patches/0115-Minecart-drop-name-workaround.patch

@@ -1,4 +1,4 @@
-From ac8b080a84cd7f454022a8c74abe1b64739b0d8b Mon Sep 17 00:00:00 2001
+From ff3d808f60b84231382331b5184b524c22b15260 Mon Sep 17 00:00:00 2001
 From: Fabse <fabse@uwmc.info>
 Date: Mon, 28 Mar 2016 00:46:46 +0200
 Subject: [PATCH] Minecart drop name workaround

Spigot-Server-Patches/0116-Reduce-IO-ops-opening-a-new-region-file.patch

@@ -1,4 +1,4 @@
-From a3c0ee4df66110789ff60cd8c1a0a528a1f5ace2 Mon Sep 17 00:00:00 2001
+From f614b45bd89f4ad83dfd40f76adf3ab2f75a674c Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.

Spigot-Server-Patches/0117-Sanitise-RegionFileCache-and-make-configurable.patch

@@ -1,4 +1,4 @@
-From 76f0b39c7bd7cf8c582240eca4083361aa72f8cd Mon Sep 17 00:00:00 2001
+From 1c3e85cf85bedf8ffb80a888e5d31ce6e062dfa4 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.

Spigot-Server-Patches/0118-Add-getEntity-by-UUID-API.patch

@@ -1,4 +1,4 @@
-From 93bf1fc5f332c5e23f50737a5ca7197cd92c1522 Mon Sep 17 00:00:00 2001
+From 11e2be232ed4dd1dd6cb9ffc043a90e99cb39541 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
@@ -57,5 +57,5 @@ index e957ed0..0a5301f 100644
      // Paper end
  }
 -- 
-2.5.0
+2.8.0
 

Spigot-Server-Patches/0119-Use-Optimized-Collections.patch

@@ -1,4 +1,4 @@
-From 7243594901602fc375b0f27944699f503bd5f846 Mon Sep 17 00:00:00 2001
+From 6a034f526953d0fe183e610f006e0281cddfe01c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 3a1ee86..d112216 100644
+index 9863126..1fd50dd 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -5,6 +5,7 @@ import java.util.Iterator;

Spigot-Server-Patches/0120-Do-not-load-chunks-for-light-checks.patch

@@ -1,4 +1,4 @@
-From 7e257605f53866ea3b9d47526c9bcd7161a8318d Mon Sep 17 00:00:00 2001
+From dd0baf896134511895a14357209123312b77843e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks

Spigot-Server-Patches/0121-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 754b518fd840f787991e4bf3dca11725a1d99bf5 Mon Sep 17 00:00:00 2001
+From 850404f03c403117dec2b53fea8e46697bcce012 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent

Spigot-Server-Patches/0122-Fix-reducedDebugInfo-not-initialized-on-client.patch

@@ -1,4 +1,4 @@
-From ec1e988581d5041440b25cca3d6057c343f53cb6 Mon Sep 17 00:00:00 2001
+From 069ed9ff50b216deb2783301e337235185f12dfd Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client

Spigot-Server-Patches/0123-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,4 +1,4 @@
-From 7fcd845ac3ae361b824b2267cf7eebf7e4c104df Mon Sep 17 00:00:00 2001
+From 8ac63084088e887f44453b331b10e024a53759f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate

Spigot-Server-Patches/0124-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From d862e8c16b123d217c87c59939300051e7f826dc Mon Sep 17 00:00:00 2001
+From e3337a84c25382034818296e71137ca3cee73914 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -50,7 +50,7 @@ index 5be36f5..0e1bcdd 100644
          return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory'
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 128b597..54c27c3 100644
+index 0a5301f..e6a76cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -945,7 +945,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0125-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -1,4 +1,4 @@
-From 68622172bbafb6574ee324a6617e13a652a8666a Mon Sep 17 00:00:00 2001
+From b4bdae9a2b04c0adae191946e187b19c9b193483 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics

Spigot-Server-Patches/0126-Don-t-spam-reload-spawn-chunks-in-nether-end.patch

@@ -1,4 +1,4 @@
-From 5f96c6145fc3147316a5c12e75cb650570f6717e Mon Sep 17 00:00:00 2001
+From dcd3a0ec1d9b53b4f994c6d4c0a622f26c82fdef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end

Spigot-Server-Patches/0127-Remove-Debug-checks-from-DataBits.patch

@@ -1,4 +1,4 @@
-From 5f1c0eadc3f384578b9c37a86b4596c944ea90d4 Mon Sep 17 00:00:00 2001
+From 0d6811219ca20f48c7251a8898c019bf068e4a63 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits

Spigot-Server-Patches/0128-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From e77264503edd535bdf196392f3275ba91c529b2c Mon Sep 17 00:00:00 2001
+From a136dcc9572e613f94c4899405ca51eb81817793 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names

Spigot-Server-Patches/0129-16w14a-memory-cleanup.patch

@@ -1,4 +1,4 @@
-From de9a17eabef87c1b26c85832a89254bd03c69a7a Mon Sep 17 00:00:00 2001
+From 566e2d92f7ff276738f7d20e8c6f70d84a230a97 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 7 Apr 2016 18:28:06 -0500
 Subject: [PATCH] 16w14a memory cleanup

Spigot-Server-Patches/0130-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 0c3bf99161ca9f8a9e43839b04a3ae6f089ddf79 Mon Sep 17 00:00:00 2001
+From 7490f8b95b734c163fc4ef30e271d095486e4162 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players

Spigot-Server-Patches/0131-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch

@@ -1,4 +1,4 @@
-From e822d179360823fec952115f5c9ce2216aca5376 Mon Sep 17 00:00:00 2001
+From 79460328e041588c8172ed1602ee333378b8f245 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Apr 2016 22:36:10 -0400
 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
@@ -7,7 +7,7 @@ Otherwise the player will trigger a "moved too quickly" next movement packet
 and rubber band.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 49e6661..fb5d84f 100644
+index c0b0a26..a00baa6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -288,6 +288,7 @@ public abstract class Entity implements ICommandListener {

Spigot-Server-Patches/0132-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From d43727ba66b537ad7175bdc656164c1be2c888fa Mon Sep 17 00:00:00 2001
+From 9af2e9364a19dfbe03b62c5e1e32778fd689b239 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List

Spigot-Server-Patches/0133-Don-t-tick-Skulls-unused-code.patch

@@ -1,4 +1,4 @@
-From 0752295a90cddb505faf9bbe3c5a94b07085bb25 Mon Sep 17 00:00:00 2001
+From 950604d329faa299c3f98baaba5edab8852e414e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code

Spigot-Server-Patches/0134-Fix-some-players-not-being-kicked-on-shutdown.patch

@@ -1,4 +1,4 @@
-From a57078fbc2ac6ef2c8ec3094929d0ce9360907a4 Mon Sep 17 00:00:00 2001
+From da4a8f81583a30ec10fb3091809c250a82a0ce36 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 29 Mar 2016 20:19:20 -0400
 Subject: [PATCH] Fix some players not being kicked on shutdown

Spigot-Server-Patches/0135-Configurable-Player-Collision.patch

@@ -1,4 +1,4 @@
-From 807929a1da57a5a009a5b7e547d3abef04b64b22 Mon Sep 17 00:00:00 2001
+From 364130ab14932ffd5b1630f4a651a3a8951ed892 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision

Spigot-Server-Patches/0136-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From 462b0dc22770c0eb4da0d593a5f378d76502a1ed Mon Sep 17 00:00:00 2001
+From f4b7d132129a66bac537a9af5b501e5072879cf4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client

Spigot-Server-Patches/0137-Water-mobs-should-only-spawn-in-the-water.patch

@@ -1,4 +1,4 @@
-From b0ec44dc721d48e6cdc71bf250921fa016e3ed14 Mon Sep 17 00:00:00 2001
+From 9ba6fb4551a4bb79631da91826fa8765f02e146a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water

Spigot-Server-Patches/0138-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch

@@ -1,4 +1,4 @@
-From fc56e12ac524ba22e8f7d90e3b1b2b292e7d48f6 Mon Sep 17 00:00:00 2001
+From eaba50af8952de33874cb371e284e38eb4a7db16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic

Spigot-Server-Patches/0139-Allow-capping-number-of-attempts-at-spawning-mobs.patch

@@ -1,4 +1,4 @@
-From 71a95a04fbb60facd4c7a4144ecdf0fae2c67150 Mon Sep 17 00:00:00 2001
+From ebaba6c7eb90259b93511de847a2857cc51957ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Apr 2016 21:27:14 -0400
 Subject: [PATCH] Allow capping number of attempts at spawning mobs

Spigot-Server-Patches/0140-Configurable-RCON-IP-address.patch

@@ -1,4 +1,4 @@
-From daf6c65a0f54689793a1ecfc3084421dd7c5c871 Mon Sep 17 00:00:00 2001
+From afc331f36540c02aa5a3aafcb3d00bb32fe1f1ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address

Spigot-Server-Patches/0141-Prevent-Fire-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 06bfeb7f99afd9e983159592b6c21c780d32b7d1 Mon Sep 17 00:00:00 2001
+From 4f5ed1d45344eb5daed1931745177665006623c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks

Spigot-Server-Patches/0142-Implement-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 4da14a77ec64294d7255d0029f30a9db0e71f091 Mon Sep 17 00:00:00 2001
+From 08477cd64ad64ec8bf8c743d68fcbf161f26a9ed Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent

Spigot-Server-Patches/0143-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,4 +1,4 @@
-From f5bd42c33ab6d47c45e359bbe5aaac0fee7f2db1 Mon Sep 17 00:00:00 2001
+From a2f3aefe9b23c243c566ed5dd1e06b133dd1b09e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API

Spigot-Server-Patches/0144-Vehicle-Event-Cancellation-Changes.patch

@@ -0,0 +1,94 @@
+From 14face7ab0d9775b7c28764800c4616124b796c8 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Fri, 22 Apr 2016 18:20:05 -0500
+Subject: [PATCH] Vehicle Event Cancellation Changes
+
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index a00baa6..804b345 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -1651,6 +1651,10 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     public boolean a(Entity entity, boolean flag) {
++        return this.a(entity, flag, false); // Paper
++    }
++
++    public boolean a(Entity entity, boolean flag, boolean suppressEvents) { // Paper - Add suppress
+         if (!flag && (!this.n(entity) || !entity.q(this))) {
+             return false;
+         } else {
+@@ -1659,7 +1663,7 @@ public abstract class Entity implements ICommandListener {
+             }
+ 
+             this.as = entity;
+-            this.as.o(this);
++            this.as.addRider(this, suppressEvents); // Paper
+             return true;
+         }
+     }
+@@ -1686,12 +1690,20 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     protected void o(Entity entity) {
++        // Paper start - Forward
++        this.addRider(entity, false);
++    }
++
++    private void addRider(Entity entity, boolean suppressEvents) {
++        // Paper end
+         if (entity.by() != this) {
+             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
+         } else {
+             // CraftBukkit start
+             com.google.common.base.Preconditions.checkState(!entity.passengers.contains(this), "Circular entity riding! %s %s", this, entity);
+ 
++            if (!suppressEvents) { // Paper - Make event calls suppressible
++            // =============================================================
+             CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
+             Entity orig = craft == null ? null : craft.getHandle();
+             if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
+@@ -1714,6 +1726,8 @@ public abstract class Entity implements ICommandListener {
+                 return;
+             }
+             // Spigot end
++            // =============================================================
++            } // Paper - end suppressible block
+             if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bt() instanceof EntityHuman)) {
+                 this.passengers.add(0, entity);
+             } else {
+@@ -1739,16 +1753,29 @@ public abstract class Entity implements ICommandListener {
+                 CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
+                 Entity n = craftn == null ? null : craftn.getHandle();
+                 if (event.isCancelled() || n != orig) {
++                    this.cancelDismount(entity); // Paper
+                     return;
+                 }
+             }
+             // CraftBukkit end
+-            Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
++            // Paper start - make EntityDismountEvent cancellable
++            if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) {
++                this.cancelDismount(entity);
++                return;
++            }
++            // Paper end
+             this.passengers.remove(entity);
+             entity.j = 60;
+         }
+     }
+ 
++    // Paper start
++    private void cancelDismount(Entity dismounter) {
++        this.passengers.remove(dismounter);
++        dismounter.a(this, false, true);
++    }
++    // Paper end
++
+     protected boolean q(Entity entity) {
+         return this.bu().size() < 1;
+     }
+-- 
+2.8.0
+

Spigot-Server-Patches/0145-Fix-VehicleExitEvent-cancellation.patch

@@ -1,25 +0,0 @@
-From acbc64e0d3be4b92b05dfb9cac09fd7d2f0f021a Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Fri, 22 Apr 2016 15:42:44 -0500
-Subject: [PATCH] Fix VehicleExitEvent cancellation
-
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8512105..1f59225 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1739,6 +1739,11 @@ public abstract class Entity implements ICommandListener {
-                 CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-                 Entity n = craftn == null ? null : craftn.getHandle();
-                 if (event.isCancelled() || n != orig) {
-+                    // Paper - Fix cancellation
-+                    if (entity instanceof EntityPlayer) {
-+                        ((EntityPlayer) entity).playerConnection.sendPacket(new net.minecraft.server.PacketPlayOutMount(this));
-+                    }
-+                    // Paper end
-                     return;
-                 }
-             }
--- 
-2.8.0
-