Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1cecc24 Fix tag key generator output inconsistencies (#11218) PaperMC/Paper@7d7f123 Fix wrong spawn reason for trial spawners (#11229) PaperMC/Paper@1c3c47a Correctly check enchants for ItemStack#damage (#11240) PaperMC/Paper@1187544 Fix teleport event getTo returning null (#11239) PaperMC/Paper@dd941cc Re-add patches for can-place/can-destroy API (#11238)
PurpurMC · Aug 11, 2024 · 366af80 · 366af80
1 parent abf2f21
commit 366af80
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.1-R0.1-SNAPSHOT
 
 mcVersion = 1.21.1
-paperCommit = 70dfa467e796a0dfaf74147fe3560e07a5816054
+paperCommit = dd941cc40a25a4c6217f09c121b891962726f3ee
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/generated-api/0001-Ridables.patch b/patches/generated-api/0001-Ridables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 3add91218dd3f07052aa932f0503d1f10ac3799b..fa119ead66390aaed9436fbbaf2abdcef71c4c64 100644
+index 02411466bdcf4ff731f01ccebb2c99942e0db878..e81f3efa9986a3199ceb8e58c93dcf48d358fd35 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -436,6 +436,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -18,6 +18,6 @@ index 3add91218dd3f07052aa932f0503d1f10ac3799b..fa119ead66390aaed9436fbbaf2abdce
 +    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
 +    // Purpur end
 +
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
-             final @NotNull Class<T> type) {
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
+             final @NonNull Class<T> type) {
          return GoalKey.of(type, NamespacedKey.minecraft(key));
diff --git a/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index fa119ead66390aaed9436fbbaf2abdcef71c4c64..596308b83ef30471d8ab60fdc6065480909d6271 100644
+index e81f3efa9986a3199ceb8e58c93dcf48d358fd35..7c814236923319f41de9abd5cbc12f95ce95b525 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -440,6 +440,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -16,4 +16,4 @@ index fa119ead66390aaed9436fbbaf2abdcef71c4c64..596308b83ef30471d8ab60fdc6065480
 +    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
diff --git a/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 596308b83ef30471d8ab60fdc6065480909d6271..3672800b18e0b54b32c1b691c59dc4d127213e48 100644
+index 7c814236923319f41de9abd5cbc12f95ce95b525..3c5b1b91f066110b3535210e9bbb1b139c1783a0 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -442,6 +442,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -17,4 +17,4 @@ index 596308b83ef30471d8ab60fdc6065480909d6271..3672800b18e0b54b32c1b691c59dc4d1
 +    GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
diff --git a/patches/generated-api/0004-Rabid-Wolf-API.patch b/patches/generated-api/0004-Rabid-Wolf-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rabid Wolf API
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 3672800b18e0b54b32c1b691c59dc4d127213e48..37da5e3ae1349c5406e7c700d9f6174657a807d5 100644
+index 3c5b1b91f066110b3535210e9bbb1b139c1783a0..3e5b701a6fb2b8a89a61221f3e68b65547a0717f 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -444,6 +444,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -15,4 +15,4 @@ index 3672800b18e0b54b32c1b691c59dc4d127213e48..37da5e3ae1349c5406e7c700d9f61746
 +    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
diff --git a/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Iron golem poppy calms anger
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 37da5e3ae1349c5406e7c700d9f6174657a807d5..3e41a4141095bce989c75e989293deb3f47e8e6d 100644
+index 3e5b701a6fb2b8a89a61221f3e68b65547a0717f..2718c0e5061838b01881bb231c53f4da348adce3 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -445,6 +445,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -15,4 +15,4 @@ index 37da5e3ae1349c5406e7c700d9f6174657a807d5..3e41a4141095bce989c75e989293deb3
 +    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
diff --git a/patches/server/0293-Adopt-MaterialRerouting.patch b/patches/server/0293-Adopt-MaterialRerouting.patch
@@ -7,11 +7,11 @@ Adopts the purpur-api to the material rerouting infrastructure introduced
 by upstream's upstream.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-index d7c8f26b21276d9ff1d5c7c9738cc1126ce7d4b9..f0471f92044612e3a2fd12a575b8b1f844790d3a 100644
+index db8d8e2a07296d62c3097f02b03319e2e1ba9394..e5c30847297e056782084d81fb9300f98d4a8f75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-@@ -690,4 +690,32 @@ public class MaterialRerouting {
-         return ItemStack.of(material, amount);
+@@ -708,4 +708,32 @@ public class MaterialRerouting {
+         meta.setCanPlaceOn(materials);
      }
      // Paper end
 +    // Purpur start