From 073e34f7f35955bef476ab36ad29d91aec197e2e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 22:58:35 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@92f872c Fix bad diff in wandering trader spawn rate patch from .4 update
PaperMC/Paper@9087a64 chore: cleanup annotations in api adventure patch
PaperMC/Paper@23b0ef5 [ci skip] rebuild patches
---
 gradle.properties                               | 2 +-
 patches/server/0002-Purpur-Server-Changes.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 38d2cf1..62bc6fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.plazmamc.plazma
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = e8b82590d0c3dd57ac1728b236117d2fcd531c4f
+paperCommit = 23b0ef524af83cdfc7d392bf558cba69b1e53757
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch
index 70de1e2..73583a2 100644
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -15095,10 +15095,10 @@ index c9fb50c33ac15fe72bc77167e4647f30942fdc5d..a6a4d5203cb5f35306f8225e56681bc2
                      this.openTradingScreen(player, this.getDisplayName(), 1);
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index ae9f9112ce9bec82e7571f679017f1723d9eb982..6f8f03c868b671ea42b45aea97d823fe0d40373e 100644
+index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2ebe14a09cc 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -160,7 +160,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
+@@ -159,7 +159,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
              int k = pos.getX() + this.random.nextInt(range * 2) - range;
              int l = pos.getZ() + this.random.nextInt(range * 2) - range;
              int i1 = world.getHeight(Heightmap.Types.WORLD_SURFACE, k, l);