diff --git a/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java b/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java
deleted file mode 100644
index 91c2d0b40..000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bukkit.craftbukkit.entity;
-
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.Projectile;
-
-public abstract class AbstractProjectile extends CraftEntity implements Projectile {
-
-    public AbstractProjectile(CraftServer server, net.minecraft.world.entity.Entity entity) {
-        super(server, entity);
-    }
-
-    @Override
-    public boolean doesBounce() {
-        return false;
-    }
-
-    @Override
-    public void setBounce(boolean doesBounce) {}
-
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java
index c0c800a55..7bf1fa554 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java
@@ -12,7 +12,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.projectiles.ProjectileSource;
 
-public class CraftAbstractArrow extends AbstractProjectile implements AbstractArrow {
+public class CraftAbstractArrow extends CraftProjectile implements AbstractArrow {
 
     public CraftAbstractArrow(CraftServer server, EntityArrow entity) {
         super(server, entity);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java
index 59df9031e..81c3c444d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java
@@ -17,7 +17,7 @@ public abstract class CraftAbstractWindCharge extends CraftFireball implements A
 
     @Override
     public net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge getHandle() {
-        return (net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge) this.entity;
+        return (net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge) super.getHandle();
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java
index e88e52a9b..612c6d4f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java
@@ -10,7 +10,7 @@ public class CraftBreezeWindCharge extends CraftAbstractWindCharge implements Br
 
     @Override
     public net.minecraft.world.entity.projectile.windcharge.BreezeWindCharge getHandle() {
-        return (net.minecraft.world.entity.projectile.windcharge.BreezeWindCharge) this.entity;
+        return (net.minecraft.world.entity.projectile.windcharge.BreezeWindCharge) super.getHandle();
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
index 7e5107378..08890e282 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
@@ -9,7 +9,7 @@ import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-public class CraftFireball extends AbstractProjectile implements Fireball {
+public class CraftFireball extends CraftProjectile implements Fireball {
     public CraftFireball(CraftServer server, EntityFireball entity) {
         super(server, entity);
     }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
index e128c9310..4acd2defc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.LlamaSpit;
 import org.bukkit.projectiles.ProjectileSource;
 
-public class CraftLlamaSpit extends AbstractProjectile implements LlamaSpit {
+public class CraftLlamaSpit extends CraftProjectile implements LlamaSpit {
 
     public CraftLlamaSpit(CraftServer server, EntityLlamaSpit entity) {
         super(server, entity);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java
index 339fcfe7d..58d8e7a7a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java
@@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.ProjectileSource;
 
-public abstract class CraftProjectile extends AbstractProjectile implements Projectile {
+public abstract class CraftProjectile extends CraftEntity implements Projectile {
     public CraftProjectile(CraftServer server, net.minecraft.world.entity.projectile.IProjectile entity) {
         super(server, entity);
     }
@@ -26,6 +26,14 @@ public abstract class CraftProjectile extends AbstractProjectile implements Proj
         getHandle().projectileSource = shooter;
     }
 
+    @Override
+    public boolean doesBounce() {
+        return false;
+    }
+
+    @Override
+    public void setBounce(boolean doesBounce) {}
+
     @Override
     public IProjectile getHandle() {
         return (IProjectile) entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
index ab21af41d..393d2bd66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
@@ -7,7 +7,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.ShulkerBullet;
 import org.bukkit.projectiles.ProjectileSource;
 
-public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBullet {
+public class CraftShulkerBullet extends CraftProjectile implements ShulkerBullet {
 
     public CraftShulkerBullet(CraftServer server, EntityShulkerBullet entity) {
         super(server, entity);