OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few cases of the vanilla mob goals

Browse source
This commit is contained in:
MiniDigger 2021-06-16 00:47:05 +02:00
parent 3fb6b93f96
commit 08fe6d3c86
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
patches/server/0428-Implement-Mob-Goal-API.patch
View file

@ -36,10 +36,10 @@ index 86cce7143abd317326cc755118bf61435e82e479..4233698d499b520dfc07c4184cefca63
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..9efe7e29faf09901e8cde8713db80ceb31453412 index 0000000000000000000000000000000000000000..dfc026d183adab1dde5942f36e7a281b3a2fc699
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
@@ -0,0 +1,463 @@ @@ -0,0 +1,467 @@
+package com.destroystokyo.paper.entity.ai; +package com.destroystokyo.paper.entity.ai;
+ +
+import com.destroystokyo.paper.entity.RangedEntity; +import com.destroystokyo.paper.entity.RangedEntity;
@ -279,6 +279,8 @@ index 0000000000000000000000000000000000000000..9efe7e29faf09901e8cde8713db80ceb
+ +
+ ignored.add("goal_selector_1"); + ignored.add("goal_selector_1");
+ ignored.add("goal_selector_2"); + ignored.add("goal_selector_2");
+ ignored.add("selector_1");
+ ignored.add("selector_2");
+ ignored.add("wrapped"); + ignored.add("wrapped");
+ +
+ bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class); + bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
@ -396,6 +398,8 @@ index 0000000000000000000000000000000000000000..9efe7e29faf09901e8cde8713db80ceb
+ } + }
+ } + }
+ name = name.replace("PathfinderGoal", ""); + name = name.replace("PathfinderGoal", "");
+ name = name.replace("TargetGoal", "");
+ name = name.replace("Goal", "");
+ StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder();
+ for (char c : name.toCharArray()) { + for (char c : name.toCharArray()) {
+ if (c >= 'A' && c <= 'Z') { + if (c >= 'A' && c <= 'Z') {
@ -937,7 +941,7 @@ index 130ab05393a7136020e06ec199256a031ba66091..8dd93620a770855450ed222dad6572e2
} }
diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..33597ba747c10bc9e2a89e6920f64ce5a737967e index 0000000000000000000000000000000000000000..b2d510459bcf90a3611f3d91dae4ccc3d29b4079
--- /dev/null --- /dev/null
+++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java +++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
@@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@