Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Cleanup

Browse Source
This commit is contained in:
Dreeam
2025-05-02 22:22:53 -04:00
parent f1df5351ca
commit 3f20ea5c71
27 changed files with 730 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
leaf-server/minecraft-patches/features/0156-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
View File

@@ -5,25 +5,35 @@ Subject: [PATCH] Optimise MobEffectUtil#getDigSpeedAmplification
diff --git a/net/minecraft/world/effect/MobEffectUtil.java b/net/minecraft/world/effect/MobEffectUtil.java
index cbf1b6af928aa439c3264b302e5f1a1ddd4c14f0..c59a503ef8bc2dabcf9f7c85c8d93fb1fcadf71f 100644
index cbf1b6af928aa439c3264b302e5f1a1ddd4c14f0..e4126bbfb46f2d3df9aac4c9362b9d81b3ecb713 100644
--- a/net/minecraft/world/effect/MobEffectUtil.java
+++ b/net/minecraft/world/effect/MobEffectUtil.java
@@ -29,12 +29,14 @@ public final class MobEffectUtil {
@@ -27,17 +27,21 @@ public final class MobEffectUtil {
}
public static int getDigSpeedAmplification(LivingEntity entity) {
int i = 0;
int i1 = 0;
- int i = 0;
- int i1 = 0;
- if (entity.hasEffect(MobEffects.DIG_SPEED)) {
- i = entity.getEffect(MobEffects.DIG_SPEED).getAmplifier();
+ // Leaf start - Optimise MobEffectUtil#getDigSpeedAmplification
+ int digAmplifier = 0;
+ int conduitAmplifier = 0;
+ MobEffectInstance digEffect = entity.getEffect(MobEffects.DIG_SPEED);
+ if (digEffect != null) {
+ i = digEffect.getAmplifier();
+ digAmplifier = digEffect.getAmplifier();
}
- if (entity.hasEffect(MobEffects.CONDUIT_POWER)) {
- i1 = entity.getEffect(MobEffects.CONDUIT_POWER).getAmplifier();
+ MobEffectInstance conduitEffect = entity.getEffect(MobEffects.CONDUIT_POWER);
+ if (conduitEffect != null) {
+ i1 = conduitEffect.getAmplifier();
+ conduitAmplifier = conduitEffect.getAmplifier();
}
return Math.max(i, i1);
- return Math.max(i, i1);
+ return Math.max(digAmplifier, conduitAmplifier);
+ // Leaf end - Optimise MobEffectUtil#getDigSpeedAmplification
}
public static boolean hasWaterBreathing(LivingEntity entity) {