diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index 29d23db412..228e1327ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -110,6 +110,16 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
         getHandle().despawnCounter = value;
     }
 
+    @Override
+    public boolean isShotFromCrossbow() {
+        return getHandle().r();
+    }
+
+    @Override
+    public void setShotFromCrossbow(boolean shotFromCrossbow) {
+        getHandle().o(shotFromCrossbow);
+    }
+
     @Override
     public EntityArrow getHandle() {
         return (EntityArrow) entity;