mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
50bb4ff2c2
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@cc56332 Final 1.20.6 Paper Upstream \o/ PurpurMC/Purpur@f1c87e4 add missing armadillo & bogged options, closes #1527
29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sat, 13 Jan 2024 20:37:54 +0300
|
|
Subject: [PATCH] lithium: entity.fast_elytra_check + entity.fast_hand_swing
|
|
|
|
Original code by CaffeineMC, licensed under LGPL v3
|
|
You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 5d1a21232cfcd21e080d8a23003406af2e0b09b1..def38ac6896ccdd7bab344cec13c76d74817e001 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -2640,6 +2640,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
|
|
protected void updateSwingTime() {
|
|
+ if (!this.swinging && this.swingTime == 0) return; // DivineMC - lithium: entity.fast_hand_swing
|
|
int i = this.getCurrentSwingDuration();
|
|
|
|
if (this.swinging) {
|
|
@@ -3613,6 +3614,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
|
|
private void updateFallFlying() {
|
|
+ if (!this.isFallFlying()) return; // DivineMC - lithium: entity.fast_elytra_check
|
|
boolean flag = this.getSharedFlag(7);
|
|
|
|
if (flag && !this.onGround() && !this.isPassenger() && !this.hasEffect(MobEffects.LEVITATION)) {
|