diff --git a/src/main/java/net/mcreator/target/entity/Mk42Entity.java b/src/main/java/net/mcreator/target/entity/Mk42Entity.java index 8c6668751..4cfa28cf6 100644 --- a/src/main/java/net/mcreator/target/entity/Mk42Entity.java +++ b/src/main/java/net/mcreator/target/entity/Mk42Entity.java @@ -170,6 +170,8 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { public InteractionResult mobInteract(Player sourceentity, InteractionHand hand) { InteractionResult retval = InteractionResult.sidedSuccess(this.level().isClientSide()); super.mobInteract(sourceentity, hand); + sourceentity.setXRot(this.getXRot()); + sourceentity.setYRot(this.getYRot()); sourceentity.startRiding(this); return retval; } @@ -270,11 +272,13 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity { hitDamage = 100; explosionRadius = 10; explosionDamage = 200; - fireProbability = 0.3F; + fireProbability = 0.18F; fireTime = 100; } - player.getMainHandItem().shrink(1); + if (!player.isCreative()) { + player.getMainHandItem().shrink(1); + } CannonShellEntity entityToSpawn = new CannonShellEntity(TargetModEntities.CANNON_SHELL.get(), player, level, hitDamage, explosionRadius, explosionDamage, fireProbability, fireTime); entityToSpawn.setPos(this.getX(), this.getEyeY(), this.getZ()); diff --git a/src/main/java/net/mcreator/target/tools/ParticleTool.java b/src/main/java/net/mcreator/target/tools/ParticleTool.java index 1e4b21279..473db48b7 100644 --- a/src/main/java/net/mcreator/target/tools/ParticleTool.java +++ b/src/main/java/net/mcreator/target/tools/ParticleTool.java @@ -90,12 +90,12 @@ public class ParticleTool { sendParticle(serverLevel, ParticleTypes.FALLING_WATER, x, y + 3, z, 2400, 3, 8, 3, 1, true); sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP, x, y, z, 2000, 6, 1, 6, 0.1, true); } - sendParticle(serverLevel, ParticleTypes.EXPLOSION, x, y + 1, z, 500, 2.5, 2.5, 2.5, 1, true); - sendParticle(serverLevel, ParticleTypes.FLASH, x, y + 1, z, 1000, 5, 5, 5, 20, true); - sendParticle(serverLevel, TargetModParticleTypes.FIRE_STAR.get(), x, y + 1, z, 2000, 0, 0, 0, 1.5, true); - sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y + 1, z, 500, 2, 3, 2, 0.005, true); - sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y, z, 1000, 7, 0.1, 7, 0.005, true); - sendParticle(serverLevel, ParticleTypes.CLOUD, x, y + 1, z, 1000, 3, 4, 3, 0.4, true); + sendParticle(serverLevel, ParticleTypes.EXPLOSION, x, y + 1, z, 300, 2.5, 2.5, 2.5, 1, true); + sendParticle(serverLevel, ParticleTypes.FLASH, x, y + 1, z, 700, 5, 5, 5, 20, true); + sendParticle(serverLevel, TargetModParticleTypes.FIRE_STAR.get(), x, y + 1, z, 1500, 0, 0, 0, 1.5, true); + sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y + 1, z, 300, 2, 3, 2, 0.005, true); + sendParticle(serverLevel, ParticleTypes.CAMPFIRE_COSY_SMOKE, x, y, z, 600, 7, 0.1, 7, 0.005, true); + sendParticle(serverLevel, ParticleTypes.CLOUD, x, y + 1, z, 700, 3, 4, 3, 0.4, true); } }