Remove some outdated API

src/main/java/net/citizensnpcs/api/CitizensAPI.java

@@ -93,6 +93,10 @@ public static InventoryHelper getInventoryHelper() {
         return getImplementation().getInventoryHelper();
     }
 
+    public static LocationLookup getLocationLookup() {
+        return getImplementation().getLocationLookup();
+    }
+
     /**
      * Retrieves the {@link NPCRegistry} previously created via {@link #createNamedNPCRegistry(String, NPCDataStore)}
      * with the given name, or null if not found.

src/main/java/net/citizensnpcs/api/CitizensPlugin.java

@@ -46,6 +46,13 @@ public interface CitizensPlugin extends Plugin {
 
     public InventoryHelper getInventoryHelper();
 
+    /**
+     * Gets the Citizens {@link LocationLookup}
+     *
+     * @return
+     */
+    public LocationLookup getLocationLookup();
+
     /**
      *
      * @param name

src/main/java/net/citizensnpcs/api/LocationLookup.java

@@ -0,0 +1,45 @@
+package net.citizensnpcs.api;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.google.common.collect.Maps;
+
+import ch.ethz.globis.phtree.PhTreeF;
+
+public class LocationLookup implements Runnable {
+    private final Map<UUID, PhTreeF<Player>> worlds = Maps.newHashMap();
+
+    public Iterable<Player> getNearbyPlayers(Location base, double dist) {
+        PhTreeF<Player> tree = worlds.get(base.getWorld().getUID());
+        if (tree == null)
+            return Collections.emptyList();
+        return () -> tree.rangeQuery(dist, base.getX(), base.getY(), base.getZ());
+    }
+
+    @Override
+    public void run() {
+        worlds.clear();
+        for (World world : Bukkit.getServer().getWorlds()) {
+            List<Player> players = world.getPlayers();
+            if (players.isEmpty())
+                continue;
+            PhTreeF<Player> tree = PhTreeF.create(3);
+            worlds.put(world.getUID(), tree);
+            Location loc = new Location(null, 0, 0, 0);
+            for (Player player : players) {
+                if (player.hasMetadata("NPC"))
+                    continue;
+                player.getLocation(loc);
+                tree.put(new double[] { loc.getX(), loc.getY(), loc.getZ() }, player);
+            }
+        }
+    }
+}

src/main/java/net/citizensnpcs/api/trait/TraitFactory.java

@@ -24,7 +24,7 @@ public interface TraitFactory {
 
     /**
      * Returns all currently registered traits, including <em>internal</em> traits
-     * 
+     *
      * @return
      */
     Collection<TraitInfo> getRegisteredTraits();
@@ -56,16 +56,6 @@ public interface TraitFactory {
      */
     Class<? extends Trait> getTraitClass(String name);
 
-    /**
-     * Checks whether the given trait is 'internal'. An internal trait is implementation-defined and is default or
-     * built-in.
-     *
-     * @param trait
-     *            The trait to check
-     * @return Whether the trait is an internal trait
-     */
-    boolean isInternalTrait(Trait trait);
-
     /**
      * Registers a trait using the given information.
      *