summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2013-07-10 20:25:34 -0400
committerEvilSeph <evilseph@gmail.com>2013-07-10 20:27:03 -0400
commit67f15266dae4d2963d5351fb20f40de63acd721e (patch)
tree807ea2e75e0ca94aae4f8e0f6b986ba1b9fd9e22 /src
parenta31158bd0be5d4f0dabe14de0a17f79c3030e65c (diff)
downloadcraftbukkit-67f15266dae4d2963d5351fb20f40de63acd721e.tar
craftbukkit-67f15266dae4d2963d5351fb20f40de63acd721e.tar.gz
craftbukkit-67f15266dae4d2963d5351fb20f40de63acd721e.tar.lz
craftbukkit-67f15266dae4d2963d5351fb20f40de63acd721e.tar.xz
craftbukkit-67f15266dae4d2963d5351fb20f40de63acd721e.zip
Return inGround when checking Arrow's OnGround state. Fixes BUKKIT-4439
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityArrow.java6
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 65e7a88f..a4766c5e 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -444,4 +444,10 @@ public class EntityArrow extends Entity implements IProjectile {
return (b0 & 1) != 0;
}
+
+ // CraftBukkit start
+ public boolean isInGround() {
+ return inGround;
+ }
+ // CraftBukkit end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4aec8e9e..8e2e5cda 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -184,6 +184,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public boolean isOnGround() {
+ if (entity instanceof EntityArrow) {
+ return ((EntityArrow) entity).isInGround();
+ }
return entity.onGround;
}