Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a3e4d1a Don't check if we can see non-visible entities PaperMC/Paper@3a5c6f8 Fix NPE in SculkBloomEvent world access (#9857) PaperMC/Paper@71a1787 [ci skip] cleanup some ATs (#9840) PaperMC/Paper@489bff9 Temp fix for serialisable blockdata PaperMC/Paper@90fe0d5 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9825) PaperMC/Paper@c1ac983 Fix log level of advancement debug message (#9860)
CloudCraftProjects · Oct 26, 2023 · 98b9fda · 98b9fda
1 parent 15b1125
commit 98b9fda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ version = 1.20.2-R0.1-SNAPSHOT
 
 mcVersion = 1.20.2
 packageVersion = 1_20_R2
-paperRef = 4b0bc74c90582f2d52d720c795228130545cd103
+paperRef = c1ac98328c3b4dc2834497aae70020af7b3c7d04
 
 org.gradle.jvmargs = -Xmx2G
 

diff --git a/patches/server/0001-Pufferfish-Server-Patches.patch b/patches/server/0001-Pufferfish-Server-Patches.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish Server Patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a79461457ea19339f47572c70705d655ebc55276..0418b768e1a0012e34573dd0b16b8296d7a84f74 100644
+index 79beac737c17412913983614bd478d33e3c6ed58..74a1ed04ee61a8bc9d1cc34d54d8cd7797a9eba1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -52,12 +52,28 @@ dependencies {
+@@ -51,6 +51,14 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 
@@ -23,6 +23,7 @@ index a79461457ea19339f47572c70705d655ebc55276..0418b768e1a0012e34573dd0b16b8296
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
+@@ -58,6 +66,14 @@ dependencies {
  }
 
  val craftbukkitPackageVersion = "1_20_R2" // Paper
@@ -2057,7 +2058,7 @@ index dbccbcb9b44e4efacdf53c2d161115cc20b36cff..66aeb0ea388a8c8a08cf33728921061a
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0c2617574e21037d94ac56ad08b490f9bca5c5af..7eaee0d0dcbb420abb5c49ba0a465d90fe513551 100644
+index 28c6ec04750daca3d77a0cee2b9f17f2508662cc..261145fced66b677e8f4159b71b4a16638c57da2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -206,7 +206,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

diff --git a/patches/server/0009-Fire-PlayerPickupArrowEvent-for-creative-players.patch b/patches/server/0009-Fire-PlayerPickupArrowEvent-for-creative-players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fire PlayerPickupArrowEvent for creative players
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..826314da2f75168d73d8f03897a86a7fe9238b6a 100644
+index 6c176933967f6ee98da3026f16a10efe4c3842fe..175c85e400f8407b371fea7881d9d698f3f24662 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -561,7 +561,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -15,5 +15,5 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..826314da2f75168d73d8f03897a86a7f
 -            if (this.pickup == Pickup.ALLOWED && !itemstack.isEmpty() && player.getInventory().canHold(itemstack) > 0) {
 +            if (!itemstack.isEmpty() && ((this.pickup == Pickup.ALLOWED && player.getInventory().canHold(itemstack) > 0) || (this.pickup == AbstractArrow.Pickup.CREATIVE_ONLY && player.getAbilities().instabuild))) { // CloudPlane - fire arrow pickup for creative players
                  ItemEntity item = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), itemstack);
-                 PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) player.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.level().getCraftServer(), this, item), (org.bukkit.entity.AbstractArrow) this.getBukkitEntity());
+                 PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) player.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.level().getCraftServer(), item), (org.bukkit.entity.AbstractArrow) this.getBukkitEntity());
                  // event.setCancelled(!entityhuman.canPickUpLoot); TODO