--- a/src/net/jrvanwhy/watermonster/WaterEntity.java	Sat Sep 24 16:10:26 2011 -0700
+++ b/src/net/jrvanwhy/watermonster/WaterEntity.java	Sun Oct 02 13:48:44 2011 -0700
@@ -28,8 +28,9 @@
 		double closestDist = -1.0;
 
 		for (int i = 0; i < players.length; i++) {
-			if (closestDist < 0.0 ||
-			    players[i].getLocation().distance(location) < closestDist) {
+			if (players[i].getWorld().equals(location.getWorld()) &&
+			    (closestDist < 0.0 ||
+			    players[i].getLocation().distance(location) < closestDist)) {
 				closestPlayer = players[i];
 				closestDist = closestPlayer.getLocation().distance(location);
 			}
@@ -157,6 +158,8 @@
 	}
 
 	private void placeMonster(Location location) {
+		if (!location.getBlock().getType().equals(Material.STATIONARY_WATER))
+			return;
 		position = location;
 		position.getBlock().setType(Material.AIR);
 	}