SPIGOT-6907: Oxygen does not restore up to value set by LivingEntity#setMaximumAir()

By: DerFrZocker <derrieple@gmail.com>

paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch

@@ -1,6 +1,28 @@
 --- a/net/minecraft/world/entity/animal/EntityDolphin.java
 +++ b/net/minecraft/world/entity/animal/EntityDolphin.java
-@@ -233,6 +233,12 @@
+@@ -65,6 +65,12 @@
+ 
+ public class EntityDolphin extends EntityWaterAnimal {
+ 
++    // CraftBukkit start - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
++    @Override
++    public int getDefaultMaxAirSupply() {
++        return TOTAL_AIR_SUPPLY;
++    }
++    // CraftBukkit end
+     private static final DataWatcherObject<BlockPosition> TREASURE_POS = DataWatcher.defineId(EntityDolphin.class, DataWatcherRegistry.BLOCK_POS);
+     private static final DataWatcherObject<Boolean> GOT_FISH = DataWatcher.defineId(EntityDolphin.class, DataWatcherRegistry.BOOLEAN);
+     private static final DataWatcherObject<Integer> MOISTNESS_LEVEL = DataWatcher.defineId(EntityDolphin.class, DataWatcherRegistry.INT);
+@@ -192,7 +198,7 @@
+ 
+     @Override
+     public int getMaxAirSupply() {
+-        return 4800;
++        return maxAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
+     }
+ 
+     @Override
+@@ -233,6 +239,12 @@
              ItemStack itemstack = entityitem.getItem();
  
              if (this.canHoldItem(itemstack)) {
@@ -13,7 +35,7 @@
                  this.onItemPickup(entityitem);
                  this.setItemSlot(EnumItemSlot.MAINHAND, itemstack);
                  this.handDropChances[EnumItemSlot.MAINHAND.getIndex()] = 2.0F;
-@@ -391,7 +397,7 @@
+@@ -391,7 +403,7 @@
  
          @Override
          public boolean canUse() {
@@ -22,7 +44,7 @@
          }
  
          @Override
-@@ -501,7 +507,7 @@
+@@ -501,7 +513,7 @@
  
          @Override
          public void start() {
@@ -31,7 +53,7 @@
          }
  
          @Override
-@@ -520,7 +526,7 @@
+@@ -520,7 +532,7 @@
              }
  
              if (this.player.isSwimming() && this.player.level.random.nextInt(6) == 0) {

paper-server/nms-patches/net/minecraft/world/entity/animal/axolotl/Axolotl.patch

@@ -1,7 +1,15 @@
 --- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -69,7 +69,8 @@
+@@ -67,9 +67,16 @@
  
+ public class Axolotl extends EntityAnimal implements LerpingModel, Bucketable {
+ 
++    // CraftBukkit start - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
++    @Override
++    public int getDefaultMaxAirSupply() {
++        return AXOLOTL_TOTAL_AIR_SUPPLY;
++    }
++    // CraftBukkit end
      public static final int TOTAL_PLAYDEAD_TIME = 200;
      protected static final ImmutableList<? extends SensorType<? extends Sensor<? super Axolotl>>> SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_ADULT, SensorType.HURT_BY, SensorType.AXOLOTL_ATTACKABLES, SensorType.AXOLOTL_TEMPTATIONS);
 -    protected static final ImmutableList<? extends MemoryModuleType<?>> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.BREED_TARGET, MemoryModuleType.NEAREST_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, MemoryModuleType.LOOK_TARGET, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN, MemoryModuleType.NEAREST_VISIBLE_ADULT, new MemoryModuleType[]{MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.PLAY_DEAD_TICKS, MemoryModuleType.NEAREST_ATTACKABLE, MemoryModuleType.TEMPTING_PLAYER, MemoryModuleType.TEMPTATION_COOLDOWN_TICKS, MemoryModuleType.IS_TEMPTED, MemoryModuleType.HAS_HUNTING_COOLDOWN});
@@ -10,7 +18,16 @@
      private static final DataWatcherObject<Integer> DATA_VARIANT = DataWatcher.defineId(Axolotl.class, DataWatcherRegistry.INT);
      private static final DataWatcherObject<Boolean> DATA_PLAYING_DEAD = DataWatcher.defineId(Axolotl.class, DataWatcherRegistry.BOOLEAN);
      private static final DataWatcherObject<Boolean> FROM_BUCKET = DataWatcher.defineId(Axolotl.class, DataWatcherRegistry.BOOLEAN);
-@@ -236,6 +237,7 @@
+@@ -185,7 +192,7 @@
+ 
+     @Override
+     public int getMaxAirSupply() {
+-        return 6000;
++        return maxAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
+     }
+ 
+     public Axolotl.Variant getVariant() {
+@@ -236,6 +243,7 @@
      @Override
      public void setFromBucket(boolean flag) {
          this.entityData.set(Axolotl.FROM_BUCKET, flag);
@@ -18,7 +35,7 @@
      }
  
      @Nullable
-@@ -419,7 +421,7 @@
+@@ -419,7 +427,7 @@
  
          if (i < 2400) {
              i = Math.min(2400, 100 + i);
@@ -27,7 +44,7 @@
          }
  
          entityhuman.removeEffect(MobEffects.DIG_SLOWDOWN);
-@@ -469,7 +471,7 @@
+@@ -469,7 +477,7 @@
  
      @Override
      public BehaviorController<Axolotl> getBrain() {
@@ -36,7 +53,7 @@
      }
  
      @Override
-@@ -502,7 +504,7 @@
+@@ -502,7 +510,7 @@
  
      @Override
      public boolean removeWhenFarAway(double d0) {