From 101e3b7bd7b70542c9b5e45c2174549d094f2edf Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Tue, 15 Nov 2022 17:16:40 -0600
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2151112 Fix/improve Affects Spawning API (#7329)
---
 gradle.properties                                       | 2 +-
 patches/server/0012-AFK-API.patch                       | 6 +++---
 patches/server/0082-Redstone-deactivates-spawners.patch | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c54ef91ae..038518b0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = e22dacf4d2d39cb9d82b127953f9ad24d3e0f695
+paperCommit = 215111213b878f2d837032632c83fabe09000bc2
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch
index 159dc1248..2bef6da8a 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -155,7 +155,7 @@ index 823efad652d8ff9e96b99375b102fef6f017716e..60f89d7c77a5e792e21e93e35ed1670b
                  }
                  // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index e39965c2e50bc8ee424ea07819346e0611398e28..212ea98eeaaf4b20ba0896dab03cd092c494471a 100644
+index a00c3d96f2fc7131d1f4afa7af4e41ace3cfce89..5a3e29aedc537c672d11385cec562b2c30761730 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
 @@ -28,6 +28,7 @@ public final class EntitySelector {
@@ -200,10 +200,10 @@ index 7d0dcb65544ac20faa5dceb5cb97191b06f3800b..265d6b766001cdb8e8b9bc8538119637
      public boolean processClick(InteractionHand hand) {
          Entity vehicle = getRootVehicle();
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583bf57b087e 100644
+index 87beea39636b641dc5b46c2755a00285b7671ac5..95931a038d3c845048b1ffaadd1e930a0fcb44bb 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -156,7 +156,7 @@ public interface EntityGetter {
+@@ -154,7 +154,7 @@ public interface EntityGetter {
  
      default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
          for(Player player : this.players()) {
diff --git a/patches/server/0082-Redstone-deactivates-spawners.patch b/patches/server/0082-Redstone-deactivates-spawners.patch
index 1ffaa114b..607243561 100644
--- a/patches/server/0082-Redstone-deactivates-spawners.patch
+++ b/patches/server/0082-Redstone-deactivates-spawners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Redstone deactivates spawners
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 6dea3a2a72e41e125f715dc9e364d48896056e3b..f0b0e19ed20967cae12195707007532fbab185f8 100644
+index 641709c3a2575dbe79165beff814cb77fa7dbdc1..c60f60167e20a4f6a89521ae6b84434d5c1db29b 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -52,6 +52,7 @@ public abstract class BaseSpawner {
@@ -13,7 +13,7 @@ index 6dea3a2a72e41e125f715dc9e364d48896056e3b..f0b0e19ed20967cae12195707007532f
  
      public boolean isNearPlayer(Level world, BlockPos pos) {
 +        if (world.purpurConfig.spawnerDeactivateByRedstone && world.hasNeighborSignal(pos)) return false; // Purpur
-         return world.isAffectsSpawningPlayerNearby((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper
+         return world.hasNearbyAlivePlayerThatAffectsSpawning((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper - Affects Spawning API
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java