1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index aa11ced1..e09b519e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -175,7 +175,9 @@ public abstract class EntityLiving extends Entity {
 
             this.extinguish();
         } else {
-            this.setAirTicks(maxAirTicks); // CraftBukkit - update maxAirTicks if no longer 300
+            if (this.getAirTicks() != 300) {
+                this.setAirTicks(maxAirTicks);
+            }
         }
 
         this.aw = this.ax;