Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@00ef8bd Fix Entity#isTicking and update Paper entity command (#11590)
PaperMC/Paper@6483ecb Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@17dbf74 Improve CraftEntity and CraftPlayer equals
PaperMC/Paper@0af4e84 [ci skip] Add identifying line to some larger/optimization patches
PaperMC/Paper@bcbd108 Call CraftPlayer#onEntityRemove for all online players (#11598)
PaperMC/Paper@e47f79a Configure mockito agent (#11560)
PaperMC/Paper@94ea770 Re-add exact choice shapeless support (#11546)
PaperMC/Paper@2e6eafb Improve Minecart#getMinecartMaterial (#11544)
PaperMC/Paper@9d1c91d [ci skip] Fix UseCooldownComponent jd (#11565)
PaperMC/Paper@59b79c8 Fix NPE with enchantable (#11557)
PaperMC/Paper@6da7b9e Update Eigencraft patch to 1.21.3 (#11553)
PaperMC/Paper@1ef4c0e Improve performance of RecipeMap#removeRecipe (#11547)
This commit is contained in:
granny
2024-11-09 16:57:21 -08:00
parent 74d1b4c10a
commit e2e8c6137f
28 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/generated-api/0001-Ridables.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Ridables
diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
index e0aa5b925cbd6c2733ad70cb0722c7ab7c4d0419..db9a027260a93e1ccf5209623e44220164a5910c 100644
index 35dfd25f21ca67b7f4d69326500980f4a021ef49..cd76656694067b333152ac46bc6a40ad8d28d2ac 100644
--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -440,6 +440,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -441,6 +441,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
@@ -18,6 +18,6 @@ index e0aa5b925cbd6c2733ad70cb0722c7ab7c4d0419..db9a027260a93e1ccf5209623e442201
+ GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
+ // Purpur end
+
private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
final @NonNull Class<T> type) {
private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
return GoalKey.of(type, NamespacedKey.minecraft(key));
}

6
patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -5,10 +5,10 @@ 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 db9a027260a93e1ccf5209623e44220164a5910c..e78ac52499f82b553f64aa1c41e5b75397e72793 100644
index cd76656694067b333152ac46bc6a40ad8d28d2ac..d3b12268a01b0181b340175757c8b7f657540e94 100644
--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -444,6 +444,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -445,6 +445,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
@@ -16,4 +16,4 @@ index db9a027260a93e1ccf5209623e44220164a5910c..e78ac52499f82b553f64aa1c41e5b753
+ GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
// Purpur end
private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {

6
patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@@ -6,10 +6,10 @@ 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 e78ac52499f82b553f64aa1c41e5b75397e72793..6299eeed974666135e63d58e064ea2e40f2c84d9 100644
index d3b12268a01b0181b340175757c8b7f657540e94..79de9f1ab1e709d1402d3a8017cc729b7fffc961 100644
--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -446,6 +446,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -447,6 +447,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
@@ -17,4 +17,4 @@ index e78ac52499f82b553f64aa1c41e5b75397e72793..6299eeed974666135e63d58e064ea2e4
+ GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
// Purpur end
private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {

6
patches/generated-api/0004-Rabid-Wolf-API.patch
View File

@@ -5,14 +5,14 @@ Subject: [PATCH] Rabid Wolf API
diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
index 6299eeed974666135e63d58e064ea2e40f2c84d9..b776641219febcbf6b6b76fd27ea40a907cab745 100644
index 79de9f1ab1e709d1402d3a8017cc729b7fffc961..e8b22b5ea11671d847a2e243ce570afd4ecb8aca 100644
--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -448,6 +448,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -449,6 +449,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
+ GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
// Purpur end
private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {

6
patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
View File

@@ -5,14 +5,14 @@ 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 b776641219febcbf6b6b76fd27ea40a907cab745..51cea31c55c7e1a00cfb966349147fc874e1736b 100644
index e8b22b5ea11671d847a2e243ce570afd4ecb8aca..a9816fbfa466b3fe3f82c19aeeeb564c660e4b6a 100644
--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -449,6 +449,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -450,6 +450,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
+ GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
// Purpur end
private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {