diff --git a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
index 12ff86e254f..03afac942c7 100644
--- a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index c9054fc91..ee3d37a71 100644
+index c9054fc9..ee3d37a7 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index c9054fc91..ee3d37a71 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..8a06cb165 100644
+index 2b66a08a..8a06cb16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/Easter-and-April-Fools-fall-on-the-same-day.patch b/Spigot-Server-Patches/Easter-and-April-Fools-fall-on-the-same-day.patch
index cc40cf3a75d..3cf3ed0d247 100644
--- a/Spigot-Server-Patches/Easter-and-April-Fools-fall-on-the-same-day.patch
+++ b/Spigot-Server-Patches/Easter-and-April-Fools-fall-on-the-same-day.patch
@@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit
 ¯\_(ツ)_/¯
 
 diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
-index 08131afc..7366c4b4 100644
+index 08131afc..82c37b87 100644
 --- a/src/main/java/net/minecraft/server/EntityEgg.java
 +++ b/src/main/java/net/minecraft/server/EntityEgg.java
 @@ -0,0 +0,0 @@ public class EntityEgg extends EntityProjectile {
@@ -17,8 +17,8 @@ index 08131afc..7366c4b4 100644
                  EntityType hatchingType = EntityType.CHICKEN;
  
 +                // Paper start - 2018-04-01 is easter and April fools day... come on now how can we not
-+                java.util.Date rightNow = java.util.Calendar.getInstance().getTime();
-+                if (rightNow.getDate() == 1 && rightNow.getMonth() == 3 && rightNow.getYear() == 118) {
++                java.time.LocalDate today = java.time.LocalDate.now();
++                if (today.getDayOfMonth() == 1 && today.getMonth() == java.time.Month.APRIL && today.getYear() == 2018) {
 +                    hatchingType = EntityType.RABBIT;
 +                }
 +                // Paper end
diff --git a/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
index 8e0fa297f4d..3e53a880fb3 100644
--- a/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index a8f7ff98f..9465f4c16 100644
+index a8f7ff98..9465f4c1 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -0,0 +0,0 @@ public final class ItemStack {