Paper/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch

46 lines
2.0 KiB
Diff
Raw Normal View History

From 15e6df8dfd3a4f2a37cb02e5ca6ad4e533438184 Mon Sep 17 00:00:00 2001
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
index 176af6c889..992d7bfb0f 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
2019-12-12 00:43:22 +01:00
@@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving {
2019-04-27 08:26:04 +02:00
super.move(moveType, vec3d);
}
}
+
+ @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
index 74de19bbfb..b31355f2be 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2019-12-12 00:43:22 +01:00
@@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity {
super.a(d0, flag, iblockdata, blockposition);
}
2019-12-12 00:43:22 +01:00
+ public boolean canBreatheUnderwater() { return this.cB(); } // Paper - OBFHELPER
public boolean cB() {
return this.getMonsterType() == EnumMonsterType.UNDEAD;
}
2019-12-12 00:43:22 +01:00
@@ -266,7 +267,7 @@ public abstract class EntityLiving extends Entity {
if (this.isAlive()) {
2019-12-12 00:43:22 +01:00
if (this.a(TagsFluid.WATER) && this.world.getType(new BlockPosition(this.locX(), this.getHeadY(), this.locZ())).getBlock() != Blocks.BUBBLE_COLUMN) {
- if (!this.cB() && !MobEffectUtil.c(this) && !flag1) {
+ if (!this.canBreatheUnderwater() && !MobEffectUtil.c(this) && !flag1) { // Paper - use OBFHELPER so it can be overridden
this.setAirTicks(this.l(this.getAirTicks()));
if (this.getAirTicks() == -20) {
this.setAirTicks(0);
--
2.25.1