2020-05-02 00:03:47 +02:00
|
|
|
From 2db9760a6c3eaf9c8129af28e115f5b9e3d914a5 Mon Sep 17 00:00:00 2001
|
2015-01-29 22:25:50 +01:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Tue, 1 Mar 2016 13:24:16 -0600
|
2020-02-09 05:19:54 +01:00
|
|
|
Subject: [PATCH] Allow nerfed mobs to jump and take water damage
|
2014-06-29 20:34:16 +02:00
|
|
|
|
|
|
|
|
2016-03-19 03:10:20 +01:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-02-21 18:52:20 +01:00
|
|
|
index 7d9976ce6b..6d6a68cb1b 100644
|
2016-03-19 03:10:20 +01:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-10-27 00:55:58 +02:00
|
|
|
@@ -92,4 +92,9 @@ public class PaperWorldConfig {
|
2016-11-17 03:23:38 +01:00
|
|
|
fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
|
2016-03-19 03:10:20 +01:00
|
|
|
log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean nerfedMobsShouldJump;
|
|
|
|
+ private void nerfedMobsShouldJump() {
|
|
|
|
+ nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
|
|
|
|
+ }
|
|
|
|
}
|
2016-12-21 04:57:07 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
|
2020-02-21 18:52:20 +01:00
|
|
|
index 2e869004c8..8a6856e0fd 100644
|
2016-12-21 04:57:07 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/ControllerJump.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ControllerJump.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -13,6 +13,7 @@ public class ControllerJump {
|
2016-12-21 04:57:07 +01:00
|
|
|
this.a = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public void jumpIfSet() { this.b(); } // Paper - OBFHELPER
|
|
|
|
public void b() {
|
2019-04-24 03:00:24 +02:00
|
|
|
this.b.setJumping(this.a);
|
2016-12-21 04:57:07 +01:00
|
|
|
this.a = false;
|
2020-02-09 05:19:54 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2020-05-02 00:03:47 +02:00
|
|
|
index c75b74d558..23497aa934 100644
|
2020-02-09 05:19:54 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2020-02-21 18:52:20 +01:00
|
|
|
@@ -1103,6 +1103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2020-02-09 05:19:54 +01:00
|
|
|
return this.isInWater() || this.isInRain();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public boolean isInWaterOrRainOrBubble() { return ay(); } // Paper - OBFHELPER
|
|
|
|
public boolean ay() {
|
|
|
|
return this.isInWater() || this.isInRain() || this.l();
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
|
2020-02-21 18:52:20 +01:00
|
|
|
index 1cc66108d0..538c2169cd 100644
|
2020-02-09 05:19:54 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
|
|
@@ -171,7 +171,7 @@ public class EntityEnderman extends EntityMonster {
|
|
|
|
@Override
|
|
|
|
protected void mobTick() {
|
|
|
|
if (this.ay()) {
|
|
|
|
- this.damageEntity(DamageSource.DROWN, 1.0F);
|
|
|
|
+ this.damageEntity(DamageSource.DROWN, 1.0F); // Paper - copied in patch 13 (allow nerfed mobs to jump, float and take water damage)
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this.world.isDay() && this.ticksLived >= this.bA + 600) {
|
2014-06-29 20:34:16 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2020-02-21 18:52:20 +01:00
|
|
|
index 0b06fa2b66..70cd0801dc 100644
|
2014-06-29 20:34:16 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2019-06-25 03:47:58 +02:00
|
|
|
@@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
2019-04-24 03:00:24 +02:00
|
|
|
private final EntityAIBodyControl c;
|
2018-07-15 03:53:17 +02:00
|
|
|
protected NavigationAbstract navigation;
|
|
|
|
public PathfinderGoalSelector goalSelector;
|
2017-06-11 19:03:07 +02:00
|
|
|
+ @Nullable public PathfinderGoalFloat goalFloat; // Paper
|
2018-07-15 03:53:17 +02:00
|
|
|
public PathfinderGoalSelector targetSelector;
|
|
|
|
private EntityLiving goalTarget;
|
2019-12-11 01:56:03 +01:00
|
|
|
private final EntitySenses bw;
|
2020-02-21 18:52:20 +01:00
|
|
|
@@ -648,7 +649,17 @@ public abstract class EntityInsentient extends EntityLiving {
|
|
|
|
@Override
|
|
|
|
protected final void doTick() {
|
|
|
|
++this.ticksFarFromPlayer;
|
|
|
|
- if (!this.aware) return; // CraftBukkit
|
|
|
|
+ if (!this.aware) { // Paper start - Allow nerfed mobs to jump, float and take water damage
|
2015-07-14 19:51:38 +02:00
|
|
|
+ if (goalFloat != null) {
|
2016-12-21 04:57:07 +01:00
|
|
|
+ if (goalFloat.validConditions()) goalFloat.update();
|
|
|
|
+ this.getControllerJump().jumpIfSet();
|
2015-07-14 19:51:38 +02:00
|
|
|
+ }
|
2020-02-09 05:19:54 +01:00
|
|
|
+ if ((this instanceof EntityBlaze || this instanceof EntityEnderman) && isInWaterOrRainOrBubble()) {
|
|
|
|
+ damageEntity(DamageSource.DROWN, 1.0F);
|
|
|
|
+ }
|
2020-02-21 18:52:20 +01:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
this.world.getMethodProfiler().enter("sensing");
|
|
|
|
this.bw.a();
|
|
|
|
this.world.getMethodProfiler().exit();
|
2015-07-14 19:51:38 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
2020-02-21 18:52:20 +01:00
|
|
|
index 0f0dc7277f..43908b0400 100644
|
2015-07-14 19:51:38 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
2019-05-06 02:57:14 +02:00
|
|
|
@@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal {
|
2015-07-14 19:51:38 +02:00
|
|
|
|
|
|
|
public PathfinderGoalFloat(EntityInsentient entityinsentient) {
|
|
|
|
this.a = entityinsentient;
|
2017-10-31 16:13:55 +01:00
|
|
|
+ if (entityinsentient.getWorld().paperConfig.nerfedMobsShouldJump) entityinsentient.goalFloat = this; // Paper
|
2019-04-24 03:00:24 +02:00
|
|
|
this.a(EnumSet.of(PathfinderGoal.Type.JUMP));
|
2018-07-22 07:27:46 +02:00
|
|
|
entityinsentient.getNavigation().d(true);
|
2015-07-14 19:51:38 +02:00
|
|
|
}
|
2019-05-06 02:57:14 +02:00
|
|
|
|
|
|
|
+ public final boolean validConditions() { return this.a(); } // Paper - OBFHELPER
|
|
|
|
@Override
|
|
|
|
public boolean a() {
|
|
|
|
double d0 = (double) this.a.getHeadHeight() < 0.4D ? 0.2D : 0.4D;
|
|
|
|
@@ -19,6 +21,7 @@ public class PathfinderGoalFloat extends PathfinderGoal {
|
2019-12-11 01:56:03 +01:00
|
|
|
return this.a.isInWater() && this.a.co() > d0 || this.a.aH();
|
2016-12-21 04:57:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
+ public void update() { this.e(); } // Paper - OBFHELPER
|
2019-04-24 03:00:24 +02:00
|
|
|
@Override
|
2016-12-21 04:57:07 +01:00
|
|
|
public void e() {
|
|
|
|
if (this.a.getRandom().nextFloat() < 0.8F) {
|
2014-06-29 20:34:16 +02:00
|
|
|
--
|
2020-05-02 00:03:47 +02:00
|
|
|
2.26.2
|
2014-06-29 20:34:16 +02:00
|
|
|
|