diff --git a/Spigot-API-Patches/PreCreatureSpawnEvent.patch b/Spigot-API-Patches/PreCreatureSpawnEvent.patch
index 56d598fc76..17abb6fcbb 100644
--- a/Spigot-API-Patches/PreCreatureSpawnEvent.patch
+++ b/Spigot-API-Patches/PreCreatureSpawnEvent.patch
@@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 new file mode 100644
-index 00000000..c4751b61
+index 00000000..bac1cef3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 @@ -0,0 +0,0 @@
@@ -37,6 +37,7 @@ index 00000000..c4751b61
 + * The intent of this event is to improve server performance, so limited use cases.
 + * 
 + * Currently: NATURAL and SPAWNER based reasons. Please submit a Pull Request for future additions.
++ * Also, Plugins that replace Entity Registrations with their own custom entities might not fire this event.
 + */
 +public class PreCreatureSpawnEvent extends Event implements Cancellable {
 +    private final Location location;
diff --git a/Spigot-Server-Patches/PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/PreCreatureSpawnEvent.patch
index be0a5a4b02..7a9a010ce1 100644
--- a/Spigot-Server-Patches/PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/PreCreatureSpawnEvent.patch
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index c29df55fa..3c591e67e 100644
+index 87fe4775f..9d580ea01 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -0,0 +0,0 @@
@@ -57,7 +57,7 @@ index c29df55fa..3c591e67e 100644
  
                      if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 2cd063829..f64de94fa 100644
+index 2cd063829..e217d3340 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -0,0 +0,0 @@ public final class SpawnerCreature {
@@ -81,8 +81,6 @@ index 2cd063829..f64de94fa 100644
 +                                                                ++j4;
 +                                                                continue;
 +                                                            }
-+                                                        } else {
-+                                                            MinecraftServer.LOGGER.warn("Warning, could not find EntityType for " + cls.getName() + " contains: " + (EntityTypes.clsToTypeMap.containsKey(cls) ? "yes" : "no") + " - Please report this to Paper at https://github.com/PaperMC/Paper/issues");
 +                                                        }
 +                                                        // Paper end
                                                          EntityInsentient entityinsentient;