From 11e77a47cda5a6b73377f07a1541acea6a8b533b Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Thu, 24 Mar 2022 18:33:02 -0500
Subject: [PATCH] Fix SO when riding dolphin low on air

---
 patches/server/0006-Ridables.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch
index b41e03dd6..4bd855e07 100644
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -982,7 +982,7 @@ index 425c6da0de40983b0870c9fd1b53f16b6a11c34c..8f046fb76b6967e72abde523ffb790e0
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index b2baf0741691c9942e0cb7c161ccba528c2f6d4e..80af1e72b548ed52d148602dd66b7823f242c186 100644
+index b2baf0741691c9942e0cb7c161ccba528c2f6d4e..4a535ea98a9a786eeebe26c21b86a8c3286b57f3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -78,14 +78,87 @@ public class Dolphin extends WaterAnimal {
@@ -1017,7 +1017,7 @@ index b2baf0741691c9942e0cb7c161ccba528c2f6d4e..80af1e72b548ed52d148602dd66b7823
 +            public void purpurTick(Player rider) {
 +                if (dolphin.getAirSupply() < 150) {
 +                    // if drowning override player WASD controls to find air
-+                    tick();
++                    super.tick();
 +                } else {
 +                    waterMoveControllerWASD.purpurTick(rider);
 +                    dolphin.setDeltaMovement(dolphin.getDeltaMovement().add(0.0D, 0.005D, 0.0D));