@@ -1,17 +1,17 @@
|
||||
--- a/net/minecraft/server/EntityAreaEffectCloud.java
|
||||
+++ b/net/minecraft/server/EntityAreaEffectCloud.java
|
||||
@@ -10,6 +10,10 @@
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
+
|
||||
+import org.bukkit.craftbukkit.entity.CraftLivingEntity; // CraftBukkit
|
||||
+import org.bukkit.entity.LivingEntity; // CraftBukkit
|
||||
+
|
||||
import java.util.Map.Entry;
|
||||
@@ -13,6 +13,10 @@
|
||||
import javax.annotation.Nullable;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
@@ -102,6 +106,22 @@
|
||||
import org.apache.logging.log4j.Logger;
|
||||
+// CraftBukkit start
|
||||
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
||||
+import org.bukkit.entity.LivingEntity;
|
||||
+// CraftBukkit end
|
||||
|
||||
public class EntityAreaEffectCloud extends Entity {
|
||||
|
||||
@@ -101,6 +105,22 @@
|
||||
|
||||
}
|
||||
|
||||
@@ -34,15 +34,15 @@
|
||||
public int getColor() {
|
||||
return (Integer) this.getDataWatcher().get(EntityAreaEffectCloud.c);
|
||||
}
|
||||
@@ -245,6 +265,7 @@
|
||||
if (!list.isEmpty()) {
|
||||
Iterator iterator2 = list.iterator();
|
||||
@@ -244,6 +264,7 @@
|
||||
if (!list1.isEmpty()) {
|
||||
Iterator iterator2 = list1.iterator();
|
||||
|
||||
+ List<LivingEntity> entities = new ArrayList<LivingEntity>(); // CraftBukkit
|
||||
+ List<LivingEntity> entities = new java.util.ArrayList<LivingEntity>(); // CraftBukkit
|
||||
while (iterator2.hasNext()) {
|
||||
EntityLiving entityliving = (EntityLiving) iterator2.next();
|
||||
|
||||
@@ -254,6 +275,17 @@
|
||||
@@ -253,6 +274,17 @@
|
||||
double d2 = d0 * d0 + d1 * d1;
|
||||
|
||||
if (d2 <= (double) (f * f)) {
|
||||
@@ -58,9 +58,9 @@
|
||||
+ EntityLiving entityliving = ((CraftLivingEntity) entity).getHandle();
|
||||
+ // CraftBukkit end
|
||||
this.h.put(entityliving, this.ticksLived + this.reapplicationDelay);
|
||||
Iterator iterator3 = arraylist.iterator();
|
||||
Iterator iterator3 = list.iterator();
|
||||
|
||||
@@ -263,7 +295,7 @@
|
||||
@@ -262,7 +294,7 @@
|
||||
if (mobeffect1.getMobEffect().isInstant()) {
|
||||
mobeffect1.getMobEffect().applyInstantEffect(this, this.getSource(), entityliving, mobeffect1.getAmplifier(), 0.5D);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user