Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SO when riding dolphin low on air

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-24 18:33:02 -05:00
parent 9947768825
commit 11e77a47cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0006-Ridables.patch
View File

@@ -982,7 +982,7 @@ index 425c6da0de40983b0870c9fd1b53f16b6a11c34c..8f046fb76b6967e72abde523ffb790e0
// CraftBukkit end // 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 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 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/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 { @@ -78,14 +78,87 @@ public class Dolphin extends WaterAnimal {
@@ -1017,7 +1017,7 @@ index b2baf0741691c9942e0cb7c161ccba528c2f6d4e..80af1e72b548ed52d148602dd66b7823
+ public void purpurTick(Player rider) { + public void purpurTick(Player rider) {
+ if (dolphin.getAirSupply() < 150) { + if (dolphin.getAirSupply() < 150) {
+ // if drowning override player WASD controls to find air + // if drowning override player WASD controls to find air
+ tick(); + super.tick();
+ } else { + } else {
+ waterMoveControllerWASD.purpurTick(rider); + waterMoveControllerWASD.purpurTick(rider);
+ dolphin.setDeltaMovement(dolphin.getDeltaMovement().add(0.0D, 0.005D, 0.0D)); + dolphin.setDeltaMovement(dolphin.getDeltaMovement().add(0.0D, 0.005D, 0.0D));