mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
e58b0d08bf
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@0493ac3 Updated Upstream (Paper)
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sat, 27 Jan 2024 16:56:27 +0300
|
|
Subject: [PATCH] Fix MC-172801
|
|
|
|
Original post on Mojira: https://bugs.mojang.com/browse/MC-172801
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index f4604e543a980d6aeb485252da5a4e755aa12bfa..dfb2c5812e3d2a2fa58e80240952c07b427c6abd 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3339,7 +3339,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
|
|
protected float getFlyingSpeed() {
|
|
- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F;
|
|
+ // DivineMC start - Fix MC-172801
|
|
+ float flyingSpeed = 0.02F;
|
|
+ if (this.getAttributes().hasAttribute(Attributes.FLYING_SPEED)) {
|
|
+ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D);
|
|
+ }
|
|
+ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed;
|
|
+ // DivineMC end
|
|
}
|
|
|
|
public float getSpeed() {
|