OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 22:40:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix potion effect type removal (#11778)

Browse source 
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.
This commit is contained in:
Bjarne Koll 2024-12-23 04:51:58 +01:00 committed by GitHub
parent eb793c3131
commit f8bf600375
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file

@ -388,7 +388,6 @@
@Nullable @Nullable
public MobEffectInstance removeEffectNoUpdate(Holder<MobEffect> effect) { public MobEffectInstance removeEffectNoUpdate(Holder<MobEffect> effect) {
- return this.activeEffects.remove(effect);
+ // CraftBukkit start + // CraftBukkit start
+ return this.removeEffectNoUpdate(effect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN); + return this.removeEffectNoUpdate(effect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN);
+ } + }
@ -410,7 +409,7 @@
+ return null; + return null;
+ } + }
+ +
+ return this.activeEffects.remove(effectInstance); return this.activeEffects.remove(effect);
} }
public boolean removeEffect(Holder<MobEffect> effect) { public boolean removeEffect(Holder<MobEffect> effect) {