PaperMC/patches/server/0023-Allow-nerfed-mobs-to-jump.patch

48 lines
2.3 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:24:16 -0600
Subject: [PATCH] Allow nerfed mobs to jump
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
2023-12-05 20:39:26 +01:00
index 01761d37c9e4be4e498b62c7612885648b2968a6..183866636eb67f632728a01c8e5e11b514d89f84 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
2023-12-05 20:39:26 +01:00
@@ -112,6 +112,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
2021-06-11 14:02:28 +02:00
private final BodyRotationControl bodyRotationControl;
protected PathNavigation navigation;
public GoalSelector goalSelector;
2021-06-12 00:37:16 +02:00
+ @Nullable public net.minecraft.world.entity.ai.goal.FloatGoal goalFloat; // Paper
2021-06-11 14:02:28 +02:00
public GoalSelector targetSelector;
2021-11-23 12:27:39 +01:00
@Nullable
2021-06-11 14:02:28 +02:00
private LivingEntity target;
2023-12-05 20:39:26 +01:00
@@ -877,7 +878,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
2021-06-11 14:02:28 +02:00
@Override
protected final void serverAiStep() {
++this.noActionTime;
- if (!this.aware) return; // CraftBukkit
+ // Paper start - Allow nerfed mobs to jump and float
+ if (!this.aware) {
2021-06-11 14:02:28 +02:00
+ if (goalFloat != null) {
2021-06-17 23:39:36 +02:00
+ if (goalFloat.canUse()) goalFloat.tick();
2021-06-16 19:48:25 +02:00
+ this.getJumpControl().tick();
2021-06-11 14:02:28 +02:00
+ }
+ return;
+ }
+ // Paper end
2023-06-07 20:31:32 +02:00
this.level().getProfiler().push("sensing");
2021-06-11 14:02:28 +02:00
this.sensing.tick();
2023-06-07 20:31:32 +02:00
this.level().getProfiler().pop();
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
2023-09-22 19:59:56 +02:00
index 01950951ea06e43bedeeede489a112e577617829..7093c62be53fe99ed9880fc8ddaa07440fe4f715 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
2021-06-17 23:39:36 +02:00
@@ -9,6 +9,7 @@ public class FloatGoal extends Goal {
2021-06-11 14:02:28 +02:00
public FloatGoal(Mob mob) {
this.mob = mob;
+ if (mob.getCommandSenderWorld().paperConfig().entities.behavior.spawnerNerfedMobsShouldJump) mob.goalFloat = this; // Paper
2021-06-11 14:02:28 +02:00
this.setFlags(EnumSet.of(Goal.Flag.JUMP));
mob.getNavigation().setCanFloat(true);
}