Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f7d16f6 Fixes a couple issues with entity spawn reasons (#8390)

Author: BillyGalbreath

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = b58c0cf14a9f9b0535417e2cbd1c3a3bdd57da80
+paperCommit = f7d16f656a71790034c14d095accf8dd80177a01
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0018-EMC-MonsterEggSpawnEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 6f461397fa0ce8540aecd3c291bb5f59909b2690..2c3c3071a3987b2175f26e08714e47bf13f20345 100644
+index 1024dd826f7c14ec81b1d1a70c12e3bcf5fca217..11f057bd798ed03f02296b84b394fd0cbc9eaa16 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -348,22 +348,40 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -25,8 +25,8 @@ index 6f461397fa0ce8540aecd3c291bb5f59909b2690..2c3c3071a3987b2175f26e08714e47bf
 +    public T spawn(ServerLevel world, @Nullable ItemStack stack, @Nullable CompoundTag itemNbt, @Nullable Component name, @Nullable Player player, BlockPos pos, MobSpawnType spawnReason, boolean alignPosition, boolean invertY) {
 +        // Purpur end
          // CraftBukkit start
--        return this.spawn(world, itemNbt, name, player, pos, spawnReason, alignPosition, invertY, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
-+        return this.spawn(world, stack, itemNbt, name, player, pos, spawnReason, alignPosition, invertY, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // Purpur
+-        return this.spawn(world, itemNbt, name, player, pos, spawnReason, alignPosition, invertY, spawnReason == MobSpawnType.DISPENSER ? org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DISPENSE_EGG : org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // Paper - use correct spawn reason for dispenser spawn eggs
++        return this.spawn(world, stack, itemNbt, name, player, pos, spawnReason, alignPosition, invertY, spawnReason == MobSpawnType.DISPENSER ? org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DISPENSE_EGG : org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // Paper - use correct spawn reason for dispenser spawn eggs // Purpur
      }
 
      @Nullable