From f0ea15ab9797d934eb1711201271a473c619895c Mon Sep 17 00:00:00 2001 From: Robotia Date: Mon, 25 Jan 2016 20:32:49 -0500 Subject: [PATCH] Re-style to align with Pull Request #26 & getClass() check for entity-ness --- 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 20eb9b0..0b63372 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); } - else return null; -// throw new AssertionError("Unknown entity " + entity == null ? null : entity.getClass() + ": " + entity); // Cauldron - show the entity that caused exception + else if (entity.getClass().getName().toLowerCase().contains("entity")) { 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