diff --git a/src/main/java/com/mmodding/mmodding_lib/library/entities/projectiles/SpearEntity.java b/src/main/java/com/mmodding/mmodding_lib/library/entities/projectiles/SpearEntity.java index 8add890..57931d4 100644 --- a/src/main/java/com/mmodding/mmodding_lib/library/entities/projectiles/SpearEntity.java +++ b/src/main/java/com/mmodding/mmodding_lib/library/entities/projectiles/SpearEntity.java @@ -12,18 +12,18 @@ public class SpearEntity extends TridentEntity { - public SpearEntity(EntityType entityType, World world) { + public SpearEntity(EntityType entityType, World world, ItemStack stack) { super(entityType, world); + ((TridentEntityAccessor) this).setTridentStack(stack.copy()); } public SpearEntity(EntityType entityType, World world, LivingEntity owner, ItemStack stack) { - this(entityType, world); + this(entityType, world, stack); this.setPosition(owner.getX(), owner.getEyeY() - 0.1F, owner.getZ()); this.setOwner(owner); if (owner instanceof PlayerEntity) { this.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED; } - ((TridentEntityAccessor) this).setTridentStack(stack.copy()); this.dataTracker.set(TridentEntityAccessor.getLoyalty(), (byte) EnchantmentHelper.getLoyalty(stack)); this.dataTracker.set(TridentEntityAccessor.getEnchanted(), stack.hasGlint()); } diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSpearItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSpearItem.java index 37f605b..4788687 100644 --- a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSpearItem.java +++ b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSpearItem.java @@ -15,10 +15,10 @@ public class CustomSpearItem extends TridentItem implements ItemRegistrable { private final LaunchFactory launchFactory; public CustomSpearItem(Settings settings) { - this(settings, null); + this(null, settings); } - public CustomSpearItem(Settings settings, LaunchFactory launchFactory) { + public CustomSpearItem(LaunchFactory launchFactory, Settings settings) { super(settings); this.launchFactory = launchFactory; }