Wrap createEntity in BukkitWorld to detect corrupt entities.

EngineHub · Aug 5, 2018 · 88fc177 · 88fc177
1 parent 3341433
commit 88fc177
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
@@ -111,10 +111,19 @@ public List<com.sk89q.worldedit.entity.Entity> getEntities() {
     public com.sk89q.worldedit.entity.Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) {
         BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
         if (adapter != null) {
-            Entity createdEntity = adapter.createEntity(BukkitAdapter.adapt(getWorld(), location), entity);
-            if (createdEntity != null) {
-                return new BukkitEntity(createdEntity);
-            } else {
+            try {
+                Entity createdEntity = adapter.createEntity(BukkitAdapter.adapt(getWorld(), location), entity);
+                if (createdEntity != null) {
+                    return new BukkitEntity(createdEntity);
+                } else {
+                    return null;
+                }
+            } catch (Exception e) {
+                logger.warning("Corrupt entity found when creating: " + entity.getType().getId());
+                if (entity.getNbtData() != null) {
+                    logger.warning(entity.getNbtData().toString());
+                }
+                e.printStackTrace();
                 return null;
             }
         } else {