core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0477-Fix-PotionEffect-ignor...

20 lines
1.3 KiB
Diff
Raw Normal View History

Fix PotionEffect API Ignoring Icon bug Fixes #3142
2020-05-11 04:44:27 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Fri, 8 May 2020 00:49:18 -0400
Subject: [PATCH] Fix PotionEffect ignores icon flag
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
[Auto] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b56e8160 #519: Add ArrowBodyCountChangeEvent CraftBukkit Changes: 39806409e #697: Add ArrowBodyCountChangeEvent
2020-09-02 09:12:25 +00:00
index 32819e4a8fcb1ac5d09ec0568fbb55da7b2d489d..9577af4ffbf15e970f342976838315e023b4d83b 100644
Fix PotionEffect API Ignoring Icon bug Fixes #3142
2020-05-11 04:44:27 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
[Auto] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b56e8160 #519: Add ArrowBodyCountChangeEvent CraftBukkit Changes: 39806409e #697: Add ArrowBodyCountChangeEvent
2020-09-02 09:12:25 +00:00
@@ -410,7 +410,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
Fix PotionEffect API Ignoring Icon bug Fixes #3142
2020-05-11 04:44:27 +00:00
@Override
public boolean addPotionEffect(PotionEffect effect, boolean force) {
- getHandle().addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()), EntityPotionEffectEvent.Cause.PLUGIN);
+ getHandle().addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon
return true;
}