papermc/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch

46 lines
1.9 KiB
Diff
Raw Normal View History

From 701918eb9d15623a39667ee33c4b10a2866d2a52 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
2017-05-14 18:05:01 +00:00
index 091c96411..693f157ea 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
2017-05-14 18:05:01 +00:00
@@ -771,5 +771,10 @@ public class EntityArmorStand extends EntityLiving {
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
2017-05-21 04:41:39 +00:00
index e5c7ee17f..00201988f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2017-05-14 18:05:01 +00:00
@@ -189,6 +189,7 @@ public abstract class EntityLiving extends Entity {
super.a(d0, flag, iblockdata, blockposition);
}
2017-05-14 18:05:01 +00:00
+ public boolean canBreatheUnderwater() { return this.bL(); } // Paper - OBFHELPER
public boolean bL() {
return false;
}
2017-05-14 18:05:01 +00:00
@@ -223,7 +224,7 @@ public abstract class EntityLiving extends Entity {
if (this.isAlive()) {
if (this.a(Material.WATER)) {
2017-05-14 18:05:01 +00:00
- if (!this.bL() && !this.hasEffect(MobEffects.WATER_BREATHING) && !flag1) {
+ if (!this.canBreatheUnderwater() && !this.hasEffect(MobEffects.WATER_BREATHING) && !flag1) {
this.setAirTicks(this.d(this.getAirTicks()));
if (this.getAirTicks() == -20) {
this.setAirTicks(0);
--
2017-05-21 04:41:39 +00:00
2.13.0.windows.1