From a83fc1d6a2510af0a4ce20b4f3adc0f7f1355bb4 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Mon, 21 Nov 2011 22:39:33 +0000 Subject: [PATCH] Implemented new EnderCrystal entity class --- .../java/org/bukkit/craftbukkit/CraftWorld.java | 3 +++ .../craftbukkit/entity/CraftEnderCrystal.java | 16 ++++++++++++++++ .../bukkit/craftbukkit/entity/CraftEntity.java | 1 + 3 files changed, 20 insertions(+) create mode 100644 src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 70b4fbca0e..b22653be22 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -730,6 +730,9 @@ public class CraftWorld implements World { } } else if (EnderSignal.class.isAssignableFrom(clazz)) { entity = new EntityEnderSignal(world, x, y, z); + } else if (EnderCrystal.class.isAssignableFrom(clazz)) { + entity = new EntityEnderCrystal(world); + entity.setPositionRotation(x, y, z, 0, 0); } else if (LivingEntity.class.isAssignableFrom(clazz)) { if (Chicken.class.isAssignableFrom(clazz)) { entity = new EntityChicken(world); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java new file mode 100644 index 0000000000..c27b3a5daf --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java @@ -0,0 +1,16 @@ +package org.bukkit.craftbukkit.entity; + +import net.minecraft.server.Entity; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.entity.EnderSignal; + +public class CraftEnderCrystal extends CraftEntity implements EnderSignal { + public CraftEnderCrystal(CraftServer server, Entity entity) { + super(server, entity); + } + + @Override + public String toString() { + return "CraftEnderSignal"; + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 9827d97f9f..16cb35b36e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -110,6 +110,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { else { return new CraftFireball(server, (EntityFireball) entity); } } else if (entity instanceof EntityEnderSignal) { return new CraftEnderSignal(server, (EntityEnderSignal) entity); } + else if (entity instanceof EntityEnderCrystal) { return new CraftEnderCrystal(server, (EntityEnderCrystal) entity); } else if (entity instanceof EntityFishingHook) { return new CraftFish(server, (EntityFishingHook) entity); } else if (entity instanceof EntityItem) { return new CraftItem(server, (EntityItem) entity); } else if (entity instanceof EntityWeather) {