From 94f3bdaa69a501ac9d1d2a4ec23a2d45399e35f3 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Thu, 7 Jan 2021 21:04:50 +0100 Subject: [PATCH] Fix crash when mods add goals to skeleton horses (MC-206338) (#7509) --- .../goal/TriggerSkeletonTrapGoal.java.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/minecraft/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java.patch diff --git a/patches/minecraft/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java.patch b/patches/minecraft/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java.patch new file mode 100644 index 0000000000..011fdb9c20 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java.patch @@ -0,0 +1,22 @@ +--- a/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java ++++ b/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java +@@ -28,6 +28,10 @@ + + public void func_75246_d() { + ServerWorld serverworld = (ServerWorld)this.field_188516_a.field_70170_p; ++ // Forge: Trigger the trap in a tick task to avoid crashes when mods add goals to skeleton horses ++ // (MC-206338/Forge PR #7509) ++ serverworld.func_73046_m().func_212871_a_(new net.minecraft.util.concurrent.TickDelayedTask(serverworld.func_73046_m().func_71259_af(), () -> { ++ if (!this.field_188516_a.func_70089_S()) return; + DifficultyInstance difficultyinstance = serverworld.func_175649_E(this.field_188516_a.func_233580_cy_()); + this.field_188516_a.func_190691_p(false); + this.field_188516_a.func_110234_j(true); +@@ -47,7 +51,7 @@ + abstracthorseentity.func_70024_g(this.field_188516_a.func_70681_au().nextGaussian() * 0.5D, 0.0D, this.field_188516_a.func_70681_au().nextGaussian() * 0.5D); + serverworld.func_242417_l(abstracthorseentity); + } +- ++ })); + } + + private AbstractHorseEntity func_188515_a(DifficultyInstance p_188515_1_) {