summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-10-03 15:17:34 -0400
committerEvilSeph <evilseph@gmail.com>2011-10-03 15:17:34 -0400
commit9177c205b40cc3f8c24b3ed8085c2eb6c151eb0c (patch)
tree6ae87884882e839ecff04688ddc808bc01960f39 /src
parent11b388ff39abaead7bf0349b99c12a2fbb236a86 (diff)
downloadcraftbukkit-9177c205b40cc3f8c24b3ed8085c2eb6c151eb0c.tar
craftbukkit-9177c205b40cc3f8c24b3ed8085c2eb6c151eb0c.tar.gz
craftbukkit-9177c205b40cc3f8c24b3ed8085c2eb6c151eb0c.tar.lz
craftbukkit-9177c205b40cc3f8c24b3ed8085c2eb6c151eb0c.tar.xz
craftbukkit-9177c205b40cc3f8c24b3ed8085c2eb6c151eb0c.zip
Revert "Added callback line of sight methods. Thanks xZise!"
This reverts commit 49cf586f969626bdb59632bb2fd5adfe79d38057.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 6d5558d1..63e1d1b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Snowball;
import org.bukkit.entity.Vehicle;
import org.bukkit.util.BlockIterator;
-import org.bukkit.util.Callback;
import java.util.List;
import java.util.HashSet;
@@ -87,45 +86,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getEyeHeight();
}
- private List<Block> getLineOfSight(Callback<Boolean, Block> callback, int maxDistance, int maxLength) {
- if (maxDistance > 120) {
- maxDistance = 120;
- }
- ArrayList<Block> blocks = new ArrayList<Block>(maxLength == 0 ? 10 : maxLength);
- Iterator<Block> itr = new BlockIterator(this, maxDistance);
- while (itr.hasNext()) {
- Block block = itr.next();
- if (maxLength != 0 && blocks.size() + 1 > maxLength) {
- blocks.remove(0);
- }
- blocks.add(block);
- if (callback == null) {
- if (block.getTypeId() != 0) {
- break;
- }
- } else {
- Boolean result = callback.call(block);
- if (result != null && !result) {
- break;
- }
- }
- }
- return blocks;
- }
-
- public List<Block> getLineOfSight(Callback<Boolean, Block> callback, int maxDistance) {
- return getLineOfSight(callback, maxDistance, 0);
- }
-
- public Block getTargetBlock(Callback<Boolean, Block> callback, int maxDistance) {
- List<Block> blocks = getLineOfSight(callback, maxDistance, 1);
- return blocks.get(0);
- }
-
- public List<Block> getLastTwoTargetBlocks(Callback<Boolean, Block> callback, int maxDistance) {
- return getLineOfSight(callback, maxDistance, 2);
- }
-
private List<Block> getLineOfSight(HashSet<Byte> transparent, int maxDistance, int maxLength) {
if (maxDistance > 120) {
maxDistance = 120;