Expose attack cooldown methods for Player (#1412)

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

@@ -0,0 +1,40 @@
+From b0307c1c84d01e61a96ad64b5153abd236229626 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Tue, 4 Sep 2018 15:01:54 -0500
+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 6da68835..ae2b9752 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -1909,6 +1909,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+      * @param profile The new profile to use
+      */
+     void setPlayerProfile(PlayerProfile profile);
++
++    /**
++     * Returns the amount of ticks the current cooldown lasts
++     *
++     * @return Amount of ticks cooldown will last
++     */
++    float getCooldownPeriod();
++
++    /**
++     * Returns the percentage of attack power available based on the cooldown (zero to one).
++     *
++     * @param adjustTicks Amount of ticks to add to cooldown counter for this calculation
++     * @return Percentage of attack power available
++     */
++    float getCooledAttackStrength(float adjustTicks);
++
++    /**
++     * Reset the cooldown counter to 0, effectively starting the cooldown period.
++     */
++    void resetCooldown();
+     // Paper end
+ 
+     // Spigot start
+-- 
+2.18.0
+

Spigot-API-Patches/0149-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From bbd891e485ca3127eb1a6091021198f8e7f13b36 Mon Sep 17 00:00:00 2001
+From 6656095685e81f278910780b8b8e7b6c196727d4 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:32:28 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-index ab9e81fd..a7b8f869 100644
+index ab9e81fd2..a7b8f869c 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
 @@ -8,10 +8,19 @@ import org.bukkit.inventory.ItemStack;

Spigot-API-Patches/0150-Mob-Pathfinding-API.patch

@@ -1,4 +1,4 @@
-From 8441b5c4cf5d6774d9c65a809bcd6480a760d668 Mon Sep 17 00:00:00 2001
+From 8c127ac73fee4c7ad71b7033b438fa109bc20415 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 12:39:06 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
 new file mode 100644
-index 00000000..d6953b39
+index 000000000..d6953b390
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
 @@ -0,0 +1,167 @@
@@ -185,7 +185,7 @@ index 00000000..d6953b39
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index d029d34e..48eddcd3 100644
+index d029d34ea..48eddcd30 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -7,6 +7,14 @@ import org.bukkit.loot.Lootable;

Spigot-API-Patches/0151-Performance-Concurrency-Improvements-to-Permissions.patch

@@ -1,4 +1,4 @@
-From ebe3ab3a42a6d51c060849d75fdaba854bb6dc89 Mon Sep 17 00:00:00 2001
+From 4f1fd57d2ea5113299a778d65853cf793a729cbb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions
@@ -110,5 +110,5 @@ index d4cb00a82..486f69f86 100644
      }
  
 -- 
-2.18.0
+2.19.0
 

Spigot-API-Patches/0152-Add-ItemStackRecipeChoice-Draft-API.patch

@@ -1,4 +1,4 @@
-From d18aff755cf3e94ecc7da5eff26a6cfb85d17163 Mon Sep 17 00:00:00 2001
+From 72b028b971900862d0ef20993f92a5edb28774d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
@@ -65,5 +65,5 @@ index 000000000..43e6576b1
 +    }
 +}
 -- 
-2.18.0
+2.19.0
 

Spigot-API-Patches/0153-Implement-furnace-cook-speed-multiplier-API.patch

@@ -1,4 +1,4 @@
-From 22461a04950e5ef28f7cd61b5d28b091759234d0 Mon Sep 17 00:00:00 2001
+From 9f579908896fe5bd40e8320205d51533aff8078b Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API

Spigot-API-Patches/0154-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From d9327f143f54e3033ee83fcda98323416dfc7325 Mon Sep 17 00:00:00 2001
+From a8938a2fab6db83a3582928e8d967a12d64d39be Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:50:10 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -10,7 +10,7 @@ spawners.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 new file mode 100644
-index 00000000..d7221210
+index 000000000..d72212105
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 @@ -0,0 +1,27 @@
@@ -42,5 +42,5 @@ index 00000000..d7221210
 +    }
 +}
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-API-Patches/0155-Remove-Precondition-on-name-for-AttributeModifier.patch

@@ -1,4 +1,4 @@
-From 4797cb3399e7aef4da06bce1cb8534f166a68992 Mon Sep 17 00:00:00 2001
+From 04a41c887caf57c8e3572a7b42eac846a5af3315 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier

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

@@ -0,0 +1,56 @@
+From 33323d1c602c9e8ad8f3555b076c85046c5c36e9 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Tue, 4 Sep 2018 15:02:00 -0500
+Subject: [PATCH] Expose attack cooldown methods for Player
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
+index c7dc6fe0ef..3df3d5bbef 100644
+--- a/src/main/java/net/minecraft/server/EntityHuman.java
++++ b/src/main/java/net/minecraft/server/EntityHuman.java
+@@ -2054,14 +2054,17 @@ public abstract class EntityHuman extends EntityLiving {
+         this.datawatcher.set(EntityHuman.bA, nbttagcompound);
+     }
+ 
++    public float getCooldownPeriod() { return dG(); } // Paper - OBFHELPER
+     public float dG() {
+         return (float) (1.0D / this.getAttributeInstance(GenericAttributes.g).getValue() * 20.0D);
+     }
+ 
++    public float getCooledAttackStrength(float adjustTicks) { return r(adjustTicks); } // Paper - OBFHELPER
+     public float r(float f) {
+         return MathHelper.a(((float) this.aH + f) / this.dG(), 0.0F, 1.0F);
+     }
+ 
++    public void resetCooldown() { dH(); } // Paper - OBFHELPER
+     public void dH() {
+         this.aH = 0;
+     }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index b6cf96e187..44ee86ceec 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -1912,6 +1912,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         this.resourcePackStatus = status;
+     }
+ 
++    //Paper start
++    public float getCooldownPeriod() {
++        return getHandle().getCooldownPeriod();
++    }
++
++    public float getCooledAttackStrength(float adjustTicks) {
++        return getHandle().getCooledAttackStrength(adjustTicks);
++    }
++
++    public void resetCooldown() {
++        getHandle().resetCooldown();
++    }
++    //Paper end
++
+     // Spigot start
+     private final Player.Spigot spigot = new Player.Spigot()
+     {
+-- 
+2.19.0
+

Spigot-Server-Patches/0362-Fix-1420.patch

@@ -1,11 +1,11 @@
-From 177fa181b291c39d063a8a033d9d33c05af31c07 Mon Sep 17 00:00:00 2001
+From 3aceaeba05125f97f921e157ba60732c39ef94a2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Sep 2018 18:28:24 -0500
 Subject: [PATCH] Fix #1420
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 187f02d4e..fcb1cb36a 100644
+index 187f02d4e4..fcb1cb36af 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -492,6 +492,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -29,5 +29,5 @@ index 187f02d4e..fcb1cb36a 100644
                  flag = false;
              }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0363-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch

@@ -1,4 +1,4 @@
-From a9658dc0a2bb54d4863a966a813a70d39fc2896f Mon Sep 17 00:00:00 2001
+From f0dc399ec0f1445d0d604bd8596995c8419a8efe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 4 Sep 2018 19:07:57 -0400
 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
@@ -88,5 +88,5 @@ index f609e2ceda..bcd7af059e 100644
          // CraftBukkit start - block invalid bounding boxes
          double a = axisalignedbb.a,
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0364-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From c004ce3cd2aa07cae0ed7ef353f954a9aaa0bd88 Mon Sep 17 00:00:00 2001
+From 68235ad1887959ff32a779ad852e17538dd2610f Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 63bdb96db..96dd1a7fa 100644
+index 63bdb96db8..96dd1a7fa4 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -163,6 +163,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 63bdb96db..96dd1a7fa 100644
          int i = this.f ? 300 : 100;
          if (this.g && (!this.b.isAlive() || this.b.ticksLived - this.c > i)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bcd7af059..f6c43bab4 100644
+index bcd7af059e..f6c43bab46 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1538,6 +1538,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index bcd7af059..f6c43bab4 100644
          return SoundCategory.NEUTRAL;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 35afffede..e8e741374 100644
+index 35afffedef..e8e7413748 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -629,7 +629,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -69,7 +69,7 @@ index 35afffede..e8e741374 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1328f8889..13dd55549 100644
+index 1328f88898..13dd555491 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
@@ -207,7 +207,7 @@ index 1328f8889..13dd55549 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 68f5842cf..5ab4e01ed 100644
+index 68f5842cfe..5ab4e01edf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -258,7 +258,7 @@ index 68f5842cf..5ab4e01ed 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 17fab031b..ee8219e3b 100644
+index 17fab031b4..ee8219e3ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -674,6 +674,22 @@ public enum CraftSound {
@@ -285,7 +285,7 @@ index 17fab031b..ee8219e3b 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b6cf96e18..96232aa07 100644
+index 44ee86ceec..bfb2f1a13c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1711,7 +1711,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -306,7 +306,7 @@ index b6cf96e18..96232aa07 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a553c2065..12e2c0f6e 100644
+index a553c20657..12e2c0f6e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -426,9 +426,16 @@ public class CraftEventFactory {

Spigot-Server-Patches/0365-Allow-chests-to-be-placed-with-NBT-data.patch

@@ -1,11 +1,11 @@
-From 2778cdcac727ba60b80f7a3222f863e7bdb8dfc9 Mon Sep 17 00:00:00 2001
+From 034d33929c0ebe9a745be7d9398e7b09d9c6f5bd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 9573a4ecd..7594c16e9 100644
+index 9573a4ecdf..7594c16e99 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -305,7 +305,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@@ -18,5 +18,5 @@ index 9573a4ecd..7594c16e9 100644
      // CraftBukkit end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0366-Mob-Pathfinding-API.patch

@@ -1,4 +1,4 @@
-From 0547a2ffa21722f1ab5d985fb7fdbc610787e4b4 Mon Sep 17 00:00:00 2001
+From 223f54e341aab667ed74e7bb256abac2b9029bef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -245,5 +245,5 @@ index 5bf1cd06fa..53c2d154ed 100644
      public void setTarget(LivingEntity target) {
          EntityInsentient entity = getHandle();
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0367-Prevent-chunk-loading-from-Fluid-Flowing.patch

@@ -1,4 +1,4 @@
-From cc6b3fdf5dfb4cc3f86348dc98fcebeb545621b2 Mon Sep 17 00:00:00 2001
+From bbcc0bdc761f668866673a819bc46e41c4ae88ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
@@ -75,5 +75,5 @@ index 90ba7a346f..7f16dec688 100644
              IBlockData iblockdata1 = (IBlockData) pair.getFirst();
              Fluid fluid = (Fluid) pair.getSecond();
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0368-Prevent-pathfinding-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 89178baf536b0d8aaa0e0cb18e96101509ce62a3 Mon Sep 17 00:00:00 2001
+From 641693cea7e5475e0fafbd39d3c5b484e52153ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:52:28 -0400
 Subject: [PATCH] Prevent pathfinding from loading chunks
@@ -121,5 +121,5 @@ index 64e0b08170..93f3d2e363 100644
          Material material = iblockdata.getMaterial();
          if (iblockdata.isAir()) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0369-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch

@@ -1,4 +1,4 @@
-From c76be36e441abe401391cdebea4b878a36c66deb Mon Sep 17 00:00:00 2001
+From 0634a8db05885476afd66f777c119571a83fc5d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks

Spigot-Server-Patches/0370-Prevent-mob-spawning-from-loading-generating-chunks.patch

@@ -1,4 +1,4 @@
-From 19c62991e8d96fd05203ccb3b23d8570ce4eca0b Mon Sep 17 00:00:00 2001
+From 4c64742d8da6231825a8fa0325bb31b89138f327 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks

Spigot-Server-Patches/0371-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch

@@ -1,4 +1,4 @@
-From 12b790f4486e8c965077d12175aafeb535bd9388 Mon Sep 17 00:00:00 2001
+From 9c9fc86659689894cb0039e4b1195fa54f40502f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@@ -76,5 +76,5 @@ index 66c038784c..b6990a6d7a 100644
          public EntityTypes<? extends EntityInsentient> b;
          public int c;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0372-MC-136886-Don-t-load-chunks-looking-for-features.patch

@@ -1,4 +1,4 @@
-From d00d8472091edc7a87698f0599d81a1706aa5e15 Mon Sep 17 00:00:00 2001
+From 707e751ef2330fe64cb9b8782c5fbf9584328640 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 22:26:54 -0400
 Subject: [PATCH] MC-136886: Don't load chunks looking for features
@@ -19,5 +19,5 @@ index 6c2899e84d..075011748b 100644
                  if (ichunkaccess != null) {
                      structurestart = ichunkaccess.a(this.a());
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0373-Optimize-and-Fix-ExpiringMap-Issues.patch

@@ -1,4 +1,4 @@
-From 8fc3810e70f40446333e8ff71983e7c238afcac3 Mon Sep 17 00:00:00 2001
+From 5aaf6888330a14eb08fcce67de0e5b09b6222cc8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues

Spigot-Server-Patches/0374-Implement-furnace-cook-speed-multiplier-API.patch

@@ -1,4 +1,4 @@
-From a67af428c096543ff34c11bd1b292d72a025f514 Mon Sep 17 00:00:00 2001
+From 84c50e8b79469f1609a70f1c90504902fe10420b Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API

Spigot-Server-Patches/0375-Support-Overriding-World-Seeds.patch

@@ -1,4 +1,4 @@
-From 9dd9a3abeb5338d4fa5733683634c6c22ee59f24 Mon Sep 17 00:00:00 2001
+From 9ce08b8a9ec3af87ab649b2b24b48a3ed34633b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds

Spigot-Server-Patches/0376-Optimize-Server-World-Map.patch

@@ -1,4 +1,4 @@
-From c0d6698eb4af5eb4e477740679c2ebcf0b5cd5e0 Mon Sep 17 00:00:00 2001
+From 07e138b1a3b1fc41b26822cb7df92fbce0e9443a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map

Spigot-Server-Patches/0377-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 21b17560efb3a7b04602a4c44eb2bc7e36833939 Mon Sep 17 00:00:00 2001
+From 50beca89f83a09478bb3f69ad9ea3dd528f0b07a Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 79600cd7..81d07606 100644
+index 79600cd73e..81d0760634 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -102,11 +102,11 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 79600cd7..81d07606 100644
                          if (!event.callEvent()) {
                              flag = true;
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0378-MC-134115-Fix-Double-Chest-Conversion-Error.patch

@@ -1,4 +1,4 @@
-From 87788b37febf210a1c7e65dfee02385c878e80cb Mon Sep 17 00:00:00 2001
+From 36468491f2d0e76cf1f2f911d3fd57bb1d8fb0e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 20 Sep 2018 19:11:33 -0400
 Subject: [PATCH] MC-134115: Fix Double Chest Conversion Error

Spigot-Server-Patches/0379-Sync-Player-Position-to-Vehicles.patch

@@ -1,4 +1,4 @@
-From 140555c5ff6e1b08831fdaf59c74297ee0234102 Mon Sep 17 00:00:00 2001
+From 64eb5047c6309f9308bbb948fa7709f6952f17c6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 21 Sep 2018 11:34:00 -0400
 Subject: [PATCH] Sync Player Position to Vehicles

Spigot-Server-Patches/0380-Spigot-PR-493.patch

@@ -1,4 +1,4 @@
-From 52164d18a67472b204009f4752357d00e964982b Mon Sep 17 00:00:00 2001
+From 103d2ac19c460d07c1d86e28a458bab6e431c88b Mon Sep 17 00:00:00 2001
 From: Senmori <thesenmori@gmail.com>
 Date: Sat, 22 Sep 2018 12:55:43 -0400
 Subject: [PATCH] Spigot PR 493

Spigot-Server-Patches/0381-Return-null-if-we-get-a-ParseException-in-IChatBaseC.patch

@@ -1,4 +1,4 @@
-From a0d5ac4f248c2c822d9a070ce284d684cf0eccf6 Mon Sep 17 00:00:00 2001
+From 353f3324ebd9b865b078e5c67fdda196e3de5080 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Return null if we get a ParseException in IChatBaseComponent
@@ -16,7 +16,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index ff14b3e09..03c148f4f 100644
+index ff14b3e093..03c148f4f6 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -357,7 +357,15 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent