PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-03-03 16:51:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Slight cleanup, fixed a duplication bug, and make it so muffins don't deal any damage

Browse source
This commit is contained in:
Sollace 2022-03-27 17:55:02 +02:00
parent d9d56c634c
commit c84a38cefb
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java
View file

@ -33,16 +33,13 @@ public class HeavyProjectileItem extends ProjectileItem {
} }
@Override @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); PhysicsBodyProjectileEntity projectile = player == null ? new PhysicsBodyProjectileEntity(world) : new PhysicsBodyProjectileEntity(world, player);
if (player != null) { if (player != null) {
projectile.setVelocity(player, player.getPitch(), player.getYaw(), 0, 1.5F, 1); projectile.setVelocity(player, player.getPitch(), player.getYaw(), 0, 1.5F, 1);
} }
projectile.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED; projectile.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED;
projectile.setStack(stack.copy()); projectile.setStack(stack.copy().split(1));
if (this == UItems.MUFFIN) {
projectile.setBouncy();
}
return projectile; return projectile;
} }

14
src/main/java/com/minelittlepony/unicopia/item/MuffinItem.java
View file

@ -1,8 +1,22 @@
package com.minelittlepony.unicopia.item; 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 class MuffinItem extends HeavyProjectileItem {
public MuffinItem(Settings settings, float projectileDamage) { public MuffinItem(Settings settings, float projectileDamage) {
super(settings, 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;
}
} }