2018-07-19 04:42:43 +00:00
|
|
|
From 3be96fb3c8235713a60358332f0d6b8f54158997 Mon Sep 17 00:00:00 2001
|
2017-02-19 01:34:46 +00:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Sat, 18 Feb 2017 19:29:58 -0600
|
|
|
|
Subject: [PATCH] Do not let armorstands drown
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
2018-07-18 00:08:13 +00:00
|
|
|
index 52a1036fd..26171b343 100644
|
2017-02-19 01:34:46 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
2018-07-18 00:08:13 +00:00
|
|
|
@@ -764,5 +764,10 @@ public class EntityArmorStand extends EntityLiving {
|
2017-02-19 01:34:46 +00:00
|
|
|
super.move(moveType, x, y, z);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean canBreatheUnderwater() { // Skips a bit of damage handling code, probably a micro-optimization
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
2018-07-18 00:08:13 +00:00
|
|
|
index 8e45b557e..f4a766800 100644
|
2017-02-19 01:34:46 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2018-07-18 00:08:13 +00:00
|
|
|
@@ -200,6 +200,7 @@ public abstract class EntityLiving extends Entity {
|
2017-02-19 01:34:46 +00:00
|
|
|
super.a(d0, flag, iblockdata, blockposition);
|
|
|
|
}
|
|
|
|
|
2018-07-18 00:08:13 +00:00
|
|
|
+ public boolean canBreatheUnderwater() { return this.bZ(); } // Paper - OBFHELPER
|
|
|
|
public boolean bZ() {
|
|
|
|
return this.getMonsterType() == EnumMonsterType.UNDEAD;
|
2017-02-19 01:34:46 +00:00
|
|
|
}
|
2018-07-18 00:08:13 +00:00
|
|
|
@@ -234,7 +235,7 @@ public abstract class EntityLiving extends Entity {
|
2017-02-19 01:34:46 +00:00
|
|
|
|
|
|
|
if (this.isAlive()) {
|
2018-07-18 00:08:13 +00:00
|
|
|
if (this.a(TagsFluid.a) && this.world.getType(new BlockPosition(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ)).getBlock() != Blocks.BUBBLE_COLUMN) {
|
|
|
|
- if (!this.bZ() && !MobEffectUtil.c(this) && !flag1) {
|
|
|
|
+ if (!this.canBreatheUnderwater() && !MobEffectUtil.c(this) && !flag1) { // Paper - use OBFHELPER
|
|
|
|
this.setAirTicks(this.l(this.getAirTicks()));
|
2017-02-19 01:34:46 +00:00
|
|
|
if (this.getAirTicks() == -20) {
|
|
|
|
this.setAirTicks(0);
|
|
|
|
--
|
2018-07-04 07:55:24 +00:00
|
|
|
2.18.0
|
2017-02-19 01:34:46 +00:00
|
|
|
|