Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@123cad5 Remove incorrect parent perm from debugstick.always (#7846)
PaperMC/Paper@d8108b5 team color parameter may be null, causing NPE
PaperMC/Paper@31ccc57 Add support for Proxy Protocol (#7710)
PaperMC/Paper@a90092e Updated Upstream (CraftBukkit/Spigot) (#7848)
PaperMC/Paper@79e07f3 Fix addPassenger for Marker (#7762)
PaperMC/Paper@182a609 Fix duplicate world keys via createWorld (#7614)
PaperMC/Paper@b6a6544 Provide ComponentSerializer services (#7527)
PaperMC/Paper@3f7fbe3 Fix cb's janky level name in WorldCreator (#7851)
PaperMC/Paper@af3b377 Update ForgeFlower (#7857)

gradle.properties

@@ -6,4 +6,4 @@ group=gg.pufferfish.pufferfish
 version=1.18.2-R0.1-SNAPSHOT
 mcVersion=1.18.2
 packageVersion=1_18_R2
-paperRef=fc1752ff15f442eb4488ac78e4728b91223d3e2d
+paperRef=af3b3778f6de06af48de08d41a43565d3ff19976

patches/server/0009-Optimize-mob-spawning.patch

@@ -17,7 +17,7 @@ and, in my opinion, worth the low risk of minor mob-spawning-related
 inconsistencies.
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 7d1bbcccb9510be5185d626f7124caa3dddcc2fe..94743568aff18e58cca69c8256950fe77d1d109c 100644
+index 290646972a6b0b3b1aa03b43ceb2c398bbcfb5b9..235656c0c8be77e522eb281df9c3abc4e1a5564d 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -179,4 +179,21 @@ public class PufferfishConfig {
@@ -56,7 +56,7 @@ index 86bf3f7eabd398f2dc9e09f111f6dd496086beb3..d91f9e5ed4e452477afaa6d19538e2a9
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 340204ef44bf5e4f1b91808d90abc29217cfafde..27e90ca03275a42271bbe97ee1a63a355b098ede 100644
+index f723445ac4745742ffe528d189b0145120777d9e..6afd7c8b3a0db90dbab14b4405ae4c750e5b0ef1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -350,6 +350,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -169,10 +169,10 @@ index fb0757d4bb32123641535a88a22bc074b8d2623f..f29ee33705d5708931171c5bcca2b493
 
      private void getFullChunk(long pos, Consumer<LevelChunk> chunkConsumer) {
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-index 4814e719e0b898464692075170889fdb2729a26a..ffcd18fa852af3f24bdf5398f481b839d2dcfe6c 100644
+index 4cdfc433df67afcd455422e9baf56f167dd712ae..57fcf3910f45ce371ac2e237b277b1034caaac4e 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
 +++ b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
+@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
  import net.minecraft.world.entity.Entity;
 
  public class EntityTickList {

patches/server/0016-Dynamic-Activation-of-Brain.patch

@@ -166,10 +166,10 @@ index 42d466f7f162943886078eba3db18f2dfc2d7bee..6c0dda1ce018ec6bb2ebb97147045fff
          }
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index c77fad612ba99663af2ec4418e3c2d68752dc2c8..8229001df0a901d9016fb16e4ddc81b5a0f51452 100644
+index a910189177da0c1134c954b3d81b9e9bc4bc1420..0cc0d719e95e108263683b7a40f4ce3a8ca9465b 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -51,9 +51,12 @@ public class GoalSelector {
+@@ -50,9 +50,12 @@ public class GoalSelector {
      }
 
      // Paper start

patches/server/0018-Skip-POI-finding-if-stuck-in-vehicle.patch

@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index afbb2acd27416c801af3d718850b82a170734cd3..aa6ea8a81421ff0046bd926dedcda50f9ee02d60 100644
+index 63c997ba5e7194218e844480419c6b59a4d26e9a..6492ed0cca1158d06d8a50ca9d1fca5288d8310b 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -68,6 +68,7 @@ public class AcquirePoi extends Behavior<PathfinderMob> {
+@@ -67,6 +67,7 @@ public class AcquirePoi extends Behavior<PathfinderMob> {
      @Override
      protected void start(ServerLevel world, PathfinderMob entity, long time) {
          this.nextScheduledStart = time + 20L + (long)world.getRandom().nextInt(20);