Moved EntityType to its own class to hopefully fix the unexplainable …

…IllegalAccessErrors.
EngineHub · May 1, 2011 · 7dcb4da · 7dcb4da
1 parent 8840403
commit 7dcb4da
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/com/sk89q/worldedit/EntityType.java b/src/main/java/com/sk89q/worldedit/EntityType.java
@@ -0,0 +1,13 @@
+package com.sk89q.worldedit;
+
+/**
+ * List of removable entity types.
+ */
+public enum EntityType {
+    ARROWS,
+    ITEMS,
+    PAINTINGS,
+    BOATS,
+    MINECARTS,
+    TNT,
+}
diff --git a/src/main/java/com/sk89q/worldedit/LocalWorld.java b/src/main/java/com/sk89q/worldedit/LocalWorld.java
@@ -30,18 +30,6 @@
  * @author sk89q
  */
 public abstract class LocalWorld {
-    /**
-     * List of removable entity types.
-     */
-    public enum EntityType {
-        ARROWS,
-        ITEMS,
-        PAINTINGS,
-        BOATS,
-        MINECARTS,
-        TNT,
-    }
-
     /**
      * Random generator.
      */

diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
@@ -421,7 +421,7 @@ public int killMobs(Vector origin, int radius) {
      * @return
      */
     @Override
-    public int removeEntities(EntityType type, Vector origin, int radius) {
+    public int removeEntities(LocalWorld.EntityType type, Vector origin, int radius) {
         int num = 0;
         double radiusSq = Math.pow(radius, 2);
 

diff --git a/src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java b/src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java
@@ -24,7 +24,6 @@
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.LocalWorld.EntityType;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.patterns.*;
 import com.sk89q.worldedit.regions.CuboidRegion;