Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not call potion event if no active potion is present.

Browse Source
This commit is contained in:
IzzelAliz 2020-05-17 13:13:02 +08:00
parent 4179627a47
commit add3d5f5af
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java
View File

@ -11,6 +11,9 @@ public class EntityPotionEffectEventDispatcher {
// todo 再检查一遍 // todo 再检查一遍
@SubscribeEvent(receiveCanceled = true) @SubscribeEvent(receiveCanceled = true)
public void onPotionRemove(PotionEvent.PotionRemoveEvent event) { public void onPotionRemove(PotionEvent.PotionRemoveEvent event) {
if (event.getPotionEffect() == null) {
return;
}
EntityPotionEffectEvent.Cause cause = ((LivingEntityBridge) event.getEntityLiving()).bridge$getEffectCause().orElse(EntityPotionEffectEvent.Cause.UNKNOWN); EntityPotionEffectEvent.Cause cause = ((LivingEntityBridge) event.getEntityLiving()).bridge$getEffectCause().orElse(EntityPotionEffectEvent.Cause.UNKNOWN);
EntityPotionEffectEvent.Action action = ((LivingEntityBridge) event.getEntityLiving()).bridge$getAndResetAction(); EntityPotionEffectEvent.Action action = ((LivingEntityBridge) event.getEntityLiving()).bridge$getAndResetAction();
EntityPotionEffectEvent bukkitEvent = CraftEventFactory.callEntityPotionEffectChangeEvent(event.getEntityLiving(), event.getPotionEffect(), null, cause, action); EntityPotionEffectEvent bukkitEvent = CraftEventFactory.callEntityPotionEffectChangeEvent(event.getEntityLiving(), event.getPotionEffect(), null, cause, action);