Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 14:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Do not re-wrap vanilla goals (#10751)

Browse Source 
There is no need to rewrap vanilla goals when they're being reregistered,
this breaks some expectations around behavior outside of general
wasting of resources.

Resolves: #10743
This commit is contained in:
Shane Freeder 2024-05-24 15:22:41 +01:00 committed by GitHub
parent 5e7b65a9a9
commit 3004717b0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0359-Implement-Mob-Goal-API.patch
View File

@ -461,10 +461,10 @@ index 0000000000000000000000000000000000000000..b5f75ad725f5933db8f0688b2c0b27d6
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..02b3670cfc04209baa56d89f82b65ee30d656923 index 0000000000000000000000000000000000000000..30ed9ffd6a65914d7545636150a09327aba047c3
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
@@ -0,0 +1,216 @@ @@ -0,0 +1,224 @@
+package com.destroystokyo.paper.entity.ai; +package com.destroystokyo.paper.entity.ai;
+ +
+import java.util.Collection; +import java.util.Collection;
@ -483,7 +483,15 @@ index 0000000000000000000000000000000000000000..02b3670cfc04209baa56d89f82b65ee3
+ @Override + @Override
+ public <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal) { + public <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal) {
+ CraftMob craftMob = (CraftMob) mob; + CraftMob craftMob = (CraftMob) mob;
+ getHandle(craftMob, goal.getTypes()).addGoal(priority, new PaperCustomGoal<>(goal)); + net.minecraft.world.entity.ai.goal.Goal mojangGoal;
+
+ if (goal instanceof PaperVanillaGoal vanillaGoal) {
+ mojangGoal = vanillaGoal.getHandle();
+ } else {
+ mojangGoal = new PaperCustomGoal<>(goal);
+ }
+
+ getHandle(craftMob, goal.getTypes()).addGoal(priority, mojangGoal);
+ } + }
+ +
+ @Override + @Override