Fix CustomSpearItem & SpearEntity

MModding · Apr 26, 2024 · fe60316 · fe60316
1 parent 13efa84
commit fe60316
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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
@@ -12,18 +12,18 @@
 
 public class SpearEntity extends TridentEntity {
 
-	public SpearEntity(EntityType<? extends SpearEntity> entityType, World world) {
+	public SpearEntity(EntityType<? extends SpearEntity> entityType, World world, ItemStack stack) {
 		super(entityType, world);
+		((TridentEntityAccessor) this).setTridentStack(stack.copy());
 	}
 
 	public SpearEntity(EntityType<? extends SpearEntity> 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
@@ -15,10 +15,10 @@ public class CustomSpearItem extends TridentItem implements ItemRegistrable {
 	private final LaunchFactory<? extends SpearEntity> launchFactory;
 
 	public CustomSpearItem(Settings settings) {
-		this(settings, null);
+		this(null, settings);
 	}
 
-    public CustomSpearItem(Settings settings, LaunchFactory<? extends SpearEntity> launchFactory) {
+    public CustomSpearItem(LaunchFactory<? extends SpearEntity> launchFactory, Settings settings) {
 		super(settings);
 	    this.launchFactory = launchFactory;
     }