From 1ef2165ac499af55cc44d728a1e99961805b3db2 Mon Sep 17 00:00:00 2001 From: Robotia Date: Mon, 25 Jan 2016 13:36:34 -0500 Subject: [PATCH] Fix #24 (Hopefully) --- src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 9c87aa4..20eb9b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -173,8 +173,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { else if (entity instanceof net.minecraft.entity.item.EntityFireworkRocket) { return new CraftFirework(server, (net.minecraft.entity.item.EntityFireworkRocket) entity); } // Cauldron - used for custom entities that extend Entity directly else if (entity instanceof net.minecraft.entity.Entity) { return new CraftCustomEntity(server, (net.minecraft.entity.Entity) entity); } - - throw new AssertionError("Unknown entity " + entity == null ? null : entity.getClass() + ": " + entity); // Cauldron - show the entity that caused exception + else return null; +// throw new AssertionError("Unknown entity " + entity == null ? null : entity.getClass() + ": " + entity); // Cauldron - show the entity that caused exception } // Cauldron start - copy of getEntity() but operates on classes instead of instances, for EntityRegistry registerBukkitType