Merge #26 Move some Goal from Server to Api

We move the Find Crystal and the Orbit Crystal from Purpur-Server to Purpur-API for the those who use the Mob Goal API and this can be useful to give this goal to mob
This commit is contained in:
Hugo Planque
2020-05-07 11:06:31 +02:00
committed by William Blake Galbreath
parent e7b1eb157b
commit a03667bdd0
2 changed files with 35 additions and 6 deletions

View File

@@ -104,7 +104,7 @@ Subject: [PATCH] Ridables
.../pathfinder/PathfinderGoalHasRider.java | 21 +
.../craftbukkit/entity/CraftEntity.java | 27 +
src/main/resources/purpur.lang | 4 +-
100 files changed, 3629 insertions(+), 211 deletions(-)
100 files changed, 3629 insertions(+), 213 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -132,6 +132,19 @@ index d6ee94107..e8e0b3d25 100644
bukkitMap.put(EntityInsentient.class, Mob.class);
bukkitMap.put(EntityAgeable.class, Ageable.class);
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
index e8e0b3d2..0ab87b45 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
@@ -122,8 +122,6 @@ public class MobGoalHelper {
ignored.add("horse_abstract_1");
ignored.add("llama_3");
ignored.add("llama_4");
- ignored.add("find_crystal_goal");
- ignored.add("orbit_crystal_goal");
// Purpur end
bukkitMap.put(EntityInsentient.class, Mob.class);
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 3fdb52007..7e67292c2 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java