paper-mobswitch-fix

diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index 81caa18fca658f70846ba437ac02906f5e9653b9..aad3cd36b91858a8063c950dc230ff2fa0a4bde0 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -544,7 +544,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
                 if (entityshulker != null) {
                     entityshulker.setVariant(this.getVariant());
                     entityshulker.moveTo(vec3d);
-                    this.level().addFreshEntity(entityshulker, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - the mysteries of life
+                    this.level().addFreshEntity(entityshulker, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit - the mysteries of life
                 }

             }
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index a2a59dd2e515bf4dca84a442703c122fd36f05e0..e0ecb3678547fba690c47af57de24ff7c09efb66 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -97,6 +97,7 @@ public final class NaturalSpawner {
                 // Paper start - Only count natural spawns
                 if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
                     !(entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL ||
+                        entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.INFECTION ||
                         entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                     continue;
                 }