修复无人机添加弹药bug

This commit is contained in:
Atsuihsio 2024-07-30 19:30:56 +08:00
parent 028a4803ae
commit 824ce66cbf
2 changed files with 5 additions and 5 deletions

View file

@ -295,7 +295,7 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
private void droneDrop(Player player) { private void droneDrop(Player player) {
Level level = player.level(); Level level = player.level();
if (!level.isClientSide()) { if (!level.isClientSide()) {
RgoGrenadeEntity rgoGrenadeEntity = new RgoGrenadeEntity(player, level,80); RgoGrenadeEntity rgoGrenadeEntity = new RgoGrenadeEntity(player, level,160);
rgoGrenadeEntity.setPos(this.getX(), this.getY(), this.getZ()); rgoGrenadeEntity.setPos(this.getX(), this.getY(), this.getZ());
rgoGrenadeEntity.shoot(0, -1, 0, 0, 0.5f); rgoGrenadeEntity.shoot(0, -1, 0, 0, 0.5f);
level.addFreshEntity(rgoGrenadeEntity); level.addFreshEntity(rgoGrenadeEntity);
@ -358,11 +358,11 @@ public class DroneEntity extends PathfinderMob implements GeoEntity {
if (!this.level().isClientSide()) this.discard(); if (!this.level().isClientSide()) this.discard();
} else if (stack.getItem() == ModItems.RGO_GRENADE.get() && !this.entityData.get(KAMIKAZE)) { } else if (stack.getItem() == ModItems.RGO_GRENADE.get() && !this.entityData.get(KAMIKAZE)) {
if (!player.isCreative()) {
stack.shrink(1);
}
if (this.entityData.get(AMMO) < 6) { if (this.entityData.get(AMMO) < 6) {
this.entityData.set(AMMO, this.entityData.get(AMMO) + 1); this.entityData.set(AMMO, this.entityData.get(AMMO) + 1);
if (!player.isCreative()) {
stack.shrink(1);
}
if (player instanceof ServerPlayer serverPlayer) { if (player instanceof ServerPlayer serverPlayer) {
serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1); serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1);
} }

View file

@ -117,7 +117,7 @@ public class RgoGrenadeEntity extends ThrowableItemProjectile {
this.setDeltaMovement(this.getDeltaMovement().multiply(0.75, 0.75, -0.5)); this.setDeltaMovement(this.getDeltaMovement().multiply(0.75, 0.75, -0.5));
break; break;
} }
this.fuse = 2; this.fuse = 1;
} }
@Override @Override