diff options
Diffstat (limited to 'patches/server/0372-Fix-PotionEffect-ignores-icon-flag.patch')
-rw-r--r-- | patches/server/0372-Fix-PotionEffect-ignores-icon-flag.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0372-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0372-Fix-PotionEffect-ignores-icon-flag.patch index 1ca797412e..59291a76d6 100644 --- a/patches/server/0372-Fix-PotionEffect-ignores-icon-flag.patch +++ b/patches/server/0372-Fix-PotionEffect-ignores-icon-flag.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag Co-authored-by: Tamion <[email protected]> diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index eed8322f534a9556dbb99c4c32b135dfc3dd8b0f..6a34b4ed817c3be31d5103f82c427fdcd40d47c0 100644 +index d5135ac97b2d4af7391a58799497c649cfcf8041..c15db60f4a198c0fe754c3579ff93870e968e639 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -442,7 +442,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -455,7 +455,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @Override public boolean addPotionEffect(PotionEffect effect, boolean force) { @@ -18,7 +18,7 @@ index eed8322f534a9556dbb99c4c32b135dfc3dd8b0f..6a34b4ed817c3be31d5103f82c427fdc return true; } -@@ -463,7 +463,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -476,7 +476,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @Override public PotionEffect getPotionEffect(PotionEffectType type) { MobEffectInstance handle = this.getHandle().getEffect(CraftPotionEffectType.bukkitToMinecraft(type)); @@ -27,7 +27,7 @@ index eed8322f534a9556dbb99c4c32b135dfc3dd8b0f..6a34b4ed817c3be31d5103f82c427fdc } @Override -@@ -475,7 +475,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -488,7 +488,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public Collection<PotionEffect> getActivePotionEffects() { List<PotionEffect> effects = new ArrayList<PotionEffect>(); for (MobEffectInstance handle : this.getHandle().activeEffects.values()) { |