Skip to content

Properly update hidden effects #13173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennytv merged 1 commit into from
Dec 29, 2025
+19 −4
Merged

Properly update hidden effects #13173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-data/paper.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public net.minecraft.world.damagesource.DamageSource <init>(Lnet/minecraft/core/
public net.minecraft.world.effect.MobEffect attributeModifiers
public net.minecraft.world.effect.MobEffect$AttributeTemplate
public net.minecraft.world.effect.MobEffectInstance hiddenEffect
public net.minecraft.world.effect.MobEffectInstance isShorterDurationThan(Lnet/minecraft/world/effect/MobEffectInstance;)Z
public net.minecraft.world.entity.AreaEffectCloud durationOnUse
public net.minecraft.world.entity.AreaEffectCloud owner
public net.minecraft.world.entity.AreaEffectCloud potionContents
Expand Down
6 changes: 3 additions & 3 deletions paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ index 5461bd9a39bb20ad29d3bc110c38860cf35a770a..75f80787966cdda6f51f55a8f6cb2218
public void tick() {
super.tick();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 9ba74df17cad8b5039e4657d97daefae8c3524e9..e683302032e1fb4e38eb674472ef7fd22c7ae6e8 100644
index 92ad0b17ff735801b9a4c840f14b4c12db729427..06837062905e08a3e9c29ee030ce199ce1d540b1 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -368,6 +368,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
Expand Down Expand Up @@ -523,10 +523,10 @@ index 9ba74df17cad8b5039e4657d97daefae8c3524e9..e683302032e1fb4e38eb674472ef7fd2
movement = this.maybeBackOffFromEdge(movement, type);
Vec3 vec3 = this.collide(movement);
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index bf7d0552efd961ffe19e69e8ab194502f3a747c9..730bf0cfdc9698a74b269b76fed614e08e058153 100644
index 38eac6d27ebf3497fc1c2dfb600a7cbf4f9da7f4..9dacf9cef03ecb87464bfecf2399f2864be6d6ba 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3318,6 +3318,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3330,6 +3330,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
protected void playAttackSound() {
}

Expand Down
16 changes: 15 additions & 1 deletion paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
}
}

@@ -987,21 +_,57 @@
@@ -987,23 +_,71 @@
}

public final boolean addEffect(MobEffectInstance effectInstance) {
Expand Down Expand Up @@ -370,8 +370,12 @@
boolean flag = false;
+ // CraftBukkit start
+ boolean override = false;
+ // Paper start - Properly update hidden effects
+ boolean addAsHiddenEffect = false;
+ if (mobEffectInstance != null) {
+ override = new MobEffectInstance(mobEffectInstance).update(effectInstance);
+ addAsHiddenEffect = mobEffectInstance.getAmplifier() > effectInstance.getAmplifier() && mobEffectInstance.isShorterDurationThan(effectInstance);
+ // Paper end - Properly update hidden effects
+ }
+
+ if (fireEvent) { // Paper - Don't fire sync event during generation
Expand All @@ -393,7 +397,17 @@
+ mobEffectInstance.update(effectInstance);
this.onEffectUpdated(mobEffectInstance, true, entity);
flag = true;
+ // Paper start - Properly update hidden effects
+ } else if (addAsHiddenEffect) {
+ if (mobEffectInstance.hiddenEffect == null) {
+ mobEffectInstance.hiddenEffect = new MobEffectInstance(effectInstance);
+ } else {
+ mobEffectInstance.hiddenEffect.update(effectInstance);
+ }
+ // Paper end - Properly update hidden effects
}

effectInstance.onEffectStarted(this);
@@ -1039,11 +_,35 @@
}

Expand Down
Loading