mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
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 and take water damage
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
index decf753d088983ef6bbf32a32a6ee8d3cca3ee69..4f58fae1b3738e7e0507a46df275a258c94fcec4 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
@@ -110,6 +110,7 @@ public abstract class Mob extends LivingEntity {
|
|
private final BodyRotationControl bodyRotationControl;
|
|
protected PathNavigation navigation;
|
|
public GoalSelector goalSelector;
|
|
+ @Nullable public net.minecraft.world.entity.ai.goal.FloatGoal goalFloat; // Paper
|
|
public GoalSelector targetSelector;
|
|
@Nullable
|
|
private LivingEntity target;
|
|
@@ -812,7 +813,17 @@ public abstract class Mob extends LivingEntity {
|
|
@Override
|
|
protected final void serverAiStep() {
|
|
++this.noActionTime;
|
|
- if (!this.aware) return; // CraftBukkit
|
|
+ if (!this.aware) { // Paper start - Allow nerfed mobs to jump, float and take water damage
|
|
+ if (goalFloat != null) {
|
|
+ if (goalFloat.canUse()) goalFloat.tick();
|
|
+ this.getJumpControl().tick();
|
|
+ }
|
|
+ if (this.isSensitiveToWater() && isInWaterRainOrBubble()) {
|
|
+ hurt(DamageSource.DROWN, 1.0F);
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
this.level.getProfiler().push("sensing");
|
|
this.sensing.tick();
|
|
this.level.getProfiler().pop();
|
|
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
|
|
index 01950951ea06e43bedeeede489a112e577617829..7093c62be53fe99ed9880fc8ddaa07440fe4f715 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
|
|
@@ -9,6 +9,7 @@ public class FloatGoal extends Goal {
|
|
|
|
public FloatGoal(Mob mob) {
|
|
this.mob = mob;
|
|
+ if (mob.getCommandSenderWorld().paperConfig().entities.behavior.spawnerNerfedMobsShouldJump) mob.goalFloat = this; // Paper
|
|
this.setFlags(EnumSet.of(Goal.Flag.JUMP));
|
|
mob.getNavigation().setCanFloat(true);
|
|
}
|