diff options
| author | Bjarne Koll <[email protected]> | 2024-12-23 04:51:58 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-23 04:51:58 +0100 |
| commit | f8bf600375fed91a712993d1c3dc6329042c8274 (patch) | |
| tree | 4434e98fd87f6eb92bf110fcd3e57e951f9e6cd1 | |
| parent | eb793c313123a69cabfee8946d20293574a6b1be (diff) | |
| download | Paper-f8bf600375fed91a712993d1c3dc6329042c8274.tar.gz Paper-f8bf600375fed91a712993d1c3dc6329042c8274.zip | |
Fix potion effect type removal (#11778)
An incorrectly updated hunk attempted to remove the MobEffectInstance
from the active effect map instead of the Holder<MobEffect> as the
parameter name was changed from holder to effect during hardfork.
| -rw-r--r-- | paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch index 6e41390320..15811ba3c8 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch @@ -388,7 +388,6 @@ @Nullable public MobEffectInstance removeEffectNoUpdate(Holder<MobEffect> effect) { -- return this.activeEffects.remove(effect); + // CraftBukkit start + return this.removeEffectNoUpdate(effect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN); + } @@ -410,7 +409,7 @@ + return null; + } + -+ return this.activeEffects.remove(effectInstance); + return this.activeEffects.remove(effect); } public boolean removeEffect(Holder<MobEffect> effect) { |