851cab54e0
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) PaperMC/Paper@52fb265: Optimize custom map rendering (#11000) PaperMC/Paper@661839e: Fix and optimize getChunkCount (#11610) PaperMC/Paper@c60af44: Fix experimental minecart collisions on sloped rails PaperMC/Paper@13f48d8: [ci skip] Rebuild patches PaperMC/Paper@be886cf: Fix Naming issue inside Add PlayerArmorChangeEvent (#11614)
50 lines
2.9 KiB
Diff
50 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: granny <contact@granny.dev>
|
|
Date: Thu, 18 Jan 2024 21:01:12 +0900
|
|
Subject: [PATCH] Purpur Generated API Changes
|
|
|
|
PurpurMC
|
|
Copyright (C) 2024 PurpurMC
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
in the Software without restriction, including without limitation the rights
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in all
|
|
copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
SOFTWARE.
|
|
|
|
diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
|
index 35dfd25f21ca67b7f4d69326500980f4a021ef49..a9816fbfa466b3fe3f82c19aeeeb564c660e4b6a 100644
|
|
--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
|
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
|
@@ -441,6 +441,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
|
|
|
|
GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
|
|
|
|
+ // Purpur start
|
|
+ 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"));
|
|
+ GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
|
|
+ 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"));
|
|
+ GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
|
|
+ // Purpur end
|
|
+
|
|
private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
|
|
return GoalKey.of(type, NamespacedKey.minecraft(key));
|
|
}
|