diff --git a/src/main/java/net/mcreator/target/entity/MortarEntity.java b/src/main/java/net/mcreator/target/entity/MortarEntity.java
index 57319d17a..394cefbb4 100644
--- a/src/main/java/net/mcreator/target/entity/MortarEntity.java
+++ b/src/main/java/net/mcreator/target/entity/MortarEntity.java
@@ -179,9 +179,9 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn
                     entityToSpawn.setPos(this.getX(), this.getEyeY(), this.getZ());
                     entityToSpawn.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 8, (float) 0.5);
                     level.addFreshEntity(entityToSpawn);
-
-                    server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE, (this.getX() + 2.2 * this.getLookAngle().x), (this.getY() + 0.1 + 2.2 * this.getLookAngle().y), (this.getZ() + 2.2 * this.getLookAngle().z), 40, 0.4, 0.4, 0.4,
-                            0.015);
+                    server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE, (this.getX() + 3 * this.getLookAngle().x), (this.getY() + 0.1 + 3 * this.getLookAngle().y), (this.getZ() + 3 * this.getLookAngle().z), 40, 0.4, 0.4, 0.4,
+                            0.01);
+                    server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE, this.getX(), this.getY(), this.getZ(), 100, 2.5, 0.04, 2.5, 0.005);
                 }
             });
         }
diff --git a/src/main/java/net/mcreator/target/item/Hammer.java b/src/main/java/net/mcreator/target/item/Hammer.java
index d21b96997..878bdd2d5 100644
--- a/src/main/java/net/mcreator/target/item/Hammer.java
+++ b/src/main/java/net/mcreator/target/item/Hammer.java
@@ -43,11 +43,12 @@ public class Hammer extends SwordItem {
 
     @Override
     public ItemStack getCraftingRemainingItem(ItemStack itemstack) {
-        itemstack.setDamageValue(itemstack.getDamageValue() + 1);
-        if (itemstack.getDamageValue() >= itemstack.getMaxDamage()) {
+        ItemStack retval = new ItemStack(this);
+        retval.setDamageValue(itemstack.getDamageValue() + 1);
+        if (retval.getDamageValue() >= retval.getMaxDamage()) {
             return ItemStack.EMPTY;
         }
-        return itemstack;
+        return retval;
     }
 
     @Override