remove LivingEntity#safeFallDistance API

2026-02-20 09:57:43 +01:00 · 2024-04-29 01:22:13 -07:00
parent 24acf827ef
commit 633a2e7358
312 changed files with 22 additions and 20 deletions
--- a/patches/server/0090-Flying-squids-Oh-my.patch
+++ b/patches/server/0090-Flying-squids-Oh-my.patch
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 4 Oct 2020 12:00:42 -0500
-Subject: [PATCH] Flying squids! Oh my!
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 8211c152e6f4232e82e452b08047e4579465d770..4cd57672c548950cb4e0aa97af75ecca84be6823 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
-+++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-@@ -41,6 +41,11 @@ public class GlowSquid extends Squid {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.glowSquidMaxHealth);
-     }
- 
-+    @Override
-+    public boolean canFly() {
-+        return this.level().purpurConfig.glowSquidsCanFly;
-+    }
-+
-     @Override
-     protected ParticleOptions getInkParticle() {
-         return ParticleTypes.GLOW_SQUID_INK;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index c562eeb5e865a57fbc595de47c5d4e2b90430026..f0261117a4f8ae240b3b991053deaf8d6419b5b4 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -79,6 +79,15 @@ public class Squid extends WaterAnimal {
-         return super.getAxisForFluidCheck().offsetY(level().purpurConfig.squidOffsetWaterCheck);
-     }
- 
-+    public boolean canFly() {
-+        return this.level().purpurConfig.squidsCanFly;
-+    }
-+
-+    @Override
-+    public boolean isInWater() {
-+        return this.wasTouchingWater || canFly();
-+    }
-+
-     @Override
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-@@ -151,6 +160,7 @@ public class Squid extends WaterAnimal {
-         }
- 
-         if (this.isInWaterOrBubble()) {
-+            if (canFly()) setNoGravity(!wasTouchingWater); // Purpur
-             if (this.tentacleMovement < (float) Math.PI) {
-                 float f = this.tentacleMovement / (float) Math.PI;
-                 this.tentacleAngle = Mth.sin(f * f * (float) Math.PI) * (float) Math.PI * 0.25F;
-@@ -358,7 +368,7 @@ public class Squid extends WaterAnimal {
-             int i = this.squid.getNoActionTime();
-             if (i > 100) {
-                 this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
-            } else if (this.squid.getRandom().nextInt(reducedTickDelay(50)) == 0 || !this.squid.wasTouchingWater || !this.squid.hasMovementVector()) {
-+            } else if (this.squid.getRandom().nextInt(reducedTickDelay(50)) == 0 || !this.squid.isInWater() || !this.squid.hasMovementVector()) { // Purpur
-                 float f = this.squid.getRandom().nextFloat() * (float) (Math.PI * 2);
-                 float g = Mth.cos(f) * 0.2F;
-                 float h = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ba6ac7cc8d41710e1cdf9e130cc9ed170e6ab2b9..e6aa3036b089b509a6187e9909c353eb129369b9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -870,10 +870,12 @@ public class PurpurWorldConfig {
-     public boolean glowSquidRidable = false;
-     public boolean glowSquidControllable = true;
-     public double glowSquidMaxHealth = 10.0D;
-+    public boolean glowSquidsCanFly = false;
-     private void glowSquidSettings() {
-         glowSquidRidable = getBoolean("mobs.glow_squid.ridable", glowSquidRidable);
-         glowSquidControllable = getBoolean("mobs.glow_squid.controllable", glowSquidControllable);
-         glowSquidMaxHealth = getDouble("mobs.glow_squid.attributes.max_health", glowSquidMaxHealth);
-+        glowSquidsCanFly = getBoolean("mobs.glow_squid.can-fly", glowSquidsCanFly);
-     }
- 
-     public boolean goatRidable = false;
-@@ -1505,6 +1507,7 @@ public class PurpurWorldConfig {
-     public double squidMaxHealth = 10.0D;
-     public boolean squidImmuneToEAR = true;
-     public double squidOffsetWaterCheck = 0.0D;
-+    public boolean squidsCanFly = false;
-     private void squidSettings() {
-         squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
-         squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1516,6 +1519,7 @@ public class PurpurWorldConfig {
-         squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
-         squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
-         squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
-+        squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
-     }
- 
-     public boolean spiderRidable = false;