diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java index 1c2b65b3c..9e1742226 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java @@ -184,7 +184,6 @@ public class SmallCannonShellEntity extends FastThrowableProjectile implements G .toList(); for (var entity : entities) { causeExplode(entity.position(), false); - entity.discard(); this.discard(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java index e9513d684..77982c683 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java @@ -384,7 +384,7 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity { holdTickZ = 0; } - this.setDeltaMovement(this.getDeltaMovement().multiply(0.97, 0.94, 0.97)); + this.setDeltaMovement(this.getDeltaMovement().multiply(0.965, 0.935, 0.965)); } else { this.setDeltaMovement(this.getDeltaMovement().multiply(0.8, 1, 0.8)); this.setZRot(this.roll * 0.7f); @@ -497,6 +497,14 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity { @Override public float getEngineSoundVolume() { + Player player = EntityFindUtil.findPlayer(this.level(), this.entityData.get(CONTROLLER)); + + if (player == null) return entityData.get(POWER); + ItemStack stack = player.getMainHandItem(); + + if (stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked")) { + return entityData.get(POWER) * 0.25f; + } return entityData.get(POWER) * 2f; } diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java index f092a7259..8a921a41f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java @@ -32,7 +32,7 @@ public class ProjectileUtilMixin { (projectile.getOwner() == entity || entity.getPassengers().contains(projectile.getOwner()))) { continue; } - OBB obb = obbEntity.getOBB().inflate(pInflationAmount * 2); + OBB obb = obbEntity.getOBB().inflate(6); Optional optional = obb.clip(pStartVec.toVector3f(), pEndVec.toVector3f()); if (optional.isPresent()) { diff --git a/src/main/resources/assets/superbwarfare/sounds/drone_sound.ogg b/src/main/resources/assets/superbwarfare/sounds/drone_sound.ogg index 055547ca8..9d93ffda6 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/drone_sound.ogg and b/src/main/resources/assets/superbwarfare/sounds/drone_sound.ogg differ