diff --git a/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java b/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java index fe15a05b..ef749972 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java @@ -33,16 +33,13 @@ public class HeavyProjectileItem extends ProjectileItem { } @Override - protected ProjectileEntity createProjectile(ItemStack stack, World world, PlayerEntity player) { + protected PhysicsBodyProjectileEntity createProjectile(ItemStack stack, World world, PlayerEntity player) { PhysicsBodyProjectileEntity projectile = player == null ? new PhysicsBodyProjectileEntity(world) : new PhysicsBodyProjectileEntity(world, player); if (player != null) { projectile.setVelocity(player, player.getPitch(), player.getYaw(), 0, 1.5F, 1); } projectile.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED; - projectile.setStack(stack.copy()); - if (this == UItems.MUFFIN) { - projectile.setBouncy(); - } + projectile.setStack(stack.copy().split(1)); return projectile; } diff --git a/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java b/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java index c441abce..1fa08900 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java @@ -1,8 +1,22 @@ package com.minelittlepony.unicopia.item; +import com.minelittlepony.unicopia.entity.PhysicsBodyProjectileEntity; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + public class MuffinItem extends HeavyProjectileItem { public MuffinItem(Settings settings, float projectileDamage) { super(settings, projectileDamage); } + + @Override + protected PhysicsBodyProjectileEntity createProjectile(ItemStack stack, World world, PlayerEntity player) { + PhysicsBodyProjectileEntity projectile = super.createProjectile(stack, world, player); + projectile.setBouncy(); + projectile.setDamage(0); + return projectile; + } }