diff --git a/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 519ccaf7e..5ca1bb785 100644
--- a/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From 76c45487e76be7cbec6df4e8438bc79095cc5227 Mon Sep 17 00:00:00 2001
+From f6c6b9e66cc428f9b1b9f697c6dfedaba39c2ef2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -54,7 +54,7 @@ index dd7da4117..adfd6e855 100644
              return null;
          } else if (this.world.isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
-index 801552fc6..b3366b461 100644
+index 801552fc6..ad88cc982 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -80,7 +80,7 @@ index 801552fc6..b3366b461 100644
 +        }
 +
 +        if (targetPhantom == null) {
-+            for (EntityPhantom phantom : world.getEntities(EntityPhantom.class, getBoundingBox().grow(16, 16, 16))) {
++            for (EntityPhantom phantom : world.getEntitiesByClass(EntityPhantom.class, getBoundingBox().grow(16, 16, 16))) {
 +                if (phantom.hasLineOfSight(this)) {
 +                    attackPhantom(phantom);
 +                    break;
@@ -122,7 +122,7 @@ index 801552fc6..b3366b461 100644
      @Override
      protected void b(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index b672ac5c2..4e07287e9 100644
+index b672ac5c2..e75914c2b 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -195,7 +195,7 @@ index b672ac5c2..4e07287e9 100644
 +        @Override
 +        public boolean a() { // shouldExecute
 +            double range = maxTargetRange();
-+            List<EntityEnderCrystal> crystals = world.getEntities(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range));
++            List<EntityEnderCrystal> crystals = world.getEntitiesByClass(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range));
 +            if (crystals.isEmpty()) {
 +                return false;
 +            }
@@ -351,14 +351,14 @@ index b672ac5c2..4e07287e9 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 3a86c519c..9f78ae099 100644
+index 3a86c519c..9a0521f2a 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -30,6 +30,7 @@ public interface IEntityAccess {
          });
      }
  
-+    default <T extends Entity> List<T> getEntities(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) { return a(oclass, axisalignedbb); } // Purpur - OBFHELPER
++    default <T extends Entity> List<T> getEntitiesByClass(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) { return a(oclass, axisalignedbb); } // Purpur - OBFHELPER
      default <T extends Entity> List<T> a(Class<? extends T> oclass, AxisAlignedBB axisalignedbb) {
          return this.a(oclass, axisalignedbb, IEntitySelector.f);
      }
diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch
index 47741f9e3..909a28f90 100644
--- a/patches/server/0011-Integrate-ridables.patch
+++ b/patches/server/0011-Integrate-ridables.patch
@@ -1,4 +1,4 @@
-From e1588564c74131a5b5b60262ea82f7df7607f8d7 Mon Sep 17 00:00:00 2001
+From ec10b4fae72d2d0ad626d5f6a8b8d7638e73d6cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -2055,7 +2055,7 @@ index 94e973ffb..d743ddb9c 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 4e07287e9..7f414aee9 100644
+index e75914c2b..008f5c6fa 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -2088,7 +2088,7 @@ index 4e07287e9..7f414aee9 100644
          public boolean a() { // shouldExecute
 +            if (this.phantom.getRider() != null) return false;
              double range = maxTargetRange();
-             List<EntityEnderCrystal> crystals = world.getEntities(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range));
+             List<EntityEnderCrystal> crystals = world.getEntitiesByClass(EntityEnderCrystal.class, phantom.getBoundingBox().grow(range, range, range));
              if (crystals.isEmpty()) {
 @@ -254,6 +257,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {