diff options
| author | Warrior <[email protected]> | 2023-05-15 17:21:57 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-15 11:21:57 -0400 |
| commit | 4ba5aacc377ea4a7bd3384694effe3020d57a252 (patch) | |
| tree | b638fd97fa4a7e30b2b1c729137fab80f51f23dd | |
| parent | 5b66d33a777ab9c44cd0828b5b35843d9aa2c6de (diff) | |
| download | Paper-4ba5aacc377ea4a7bd3384694effe3020d57a252.tar.gz Paper-4ba5aacc377ea4a7bd3384694effe3020d57a252.zip | |
More accurate isInOpenWater impl (#9194)
| -rw-r--r-- | patches/server/0980-More-accurate-isInOpenWater-impl.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/patches/server/0980-More-accurate-isInOpenWater-impl.patch b/patches/server/0980-More-accurate-isInOpenWater-impl.patch new file mode 100644 index 0000000000..eaedd4c5e5 --- /dev/null +++ b/patches/server/0980-More-accurate-isInOpenWater-impl.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Warrior <[email protected]> +Date: Sun, 7 May 2023 22:33:50 +0200 +Subject: [PATCH] More accurate isInOpenWater impl + +For fishing hooks, the openWater field is true by default, and only calculated when a "fish" is approaching the bobber. +This patch changes the API impl to calculate the open water state itself instead of returning this field. + +Relevant link: https://github.com/PaperMC/Paper/issues/9131 + +== AT == +public net.minecraft.world.entity.projectile.FishingHook calculateOpenWater(Lnet/minecraft/core/BlockPos;)Z +public net.minecraft.world.entity.projectile.FishingHook outOfWaterTime + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +index 7e34d6a986a98f0b9d5c2a66000ea94e2d1f46b0..f4591dfe799538ba8aea104793ceb9995dad0bb6 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +@@ -171,7 +171,7 @@ public class CraftFishHook extends CraftProjectile implements FishHook { + + @Override + public boolean isInOpenWater() { +- return this.getHandle().isOpenWaterFishing(); ++ return this.getHandle().outOfWaterTime < 10 && this.getHandle().calculateOpenWater(this.getHandle().blockPosition()); // Paper - isOpenWaterFishing is only calculated when a "fish" is approaching the hook + } + + @Override |