diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java index 0c0faabe6..daf2d69d8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java @@ -371,7 +371,9 @@ public class FireMessage { Level level = player.level(); if (!level.isClientSide()) { GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level, - (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), (float) stack.getOrCreateTag().getDouble("ExplosionRadius")); + (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), + (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), + (float) GunsTool.getGunDoubleTag(stack, "ExplosionRadius", 0)); var dmgPerk = PerkHelper.getPerkByType(stack, Perk.Type.DAMAGE); if (dmgPerk == ModPerks.MONSTER_HUNTER.get()) { @@ -422,7 +424,9 @@ public class FireMessage { if (!level.isClientSide()) { RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, - (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), (float) tag.getDouble("ExplosionRadius")); + (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), + (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), + (float) GunsTool.getGunDoubleTag(stack, "ExplosionRadius", 0)); var dmgPerk = PerkHelper.getPerkByType(stack, Perk.Type.DAMAGE); if (dmgPerk == ModPerks.MONSTER_HUNTER.get()) { @@ -486,7 +490,9 @@ public class FireMessage { if (!level.isClientSide()) { JavelinMissileEntity missileEntity = new JavelinMissileEntity(player, level, - (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), (float) tag.getDouble("ExplosionRadius")); + (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), + (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), + (float) GunsTool.getGunDoubleTag(stack, "ExplosionRadius", 0)); var dmgPerk = PerkHelper.getPerkByType(stack, Perk.Type.DAMAGE); if (dmgPerk == ModPerks.MONSTER_HUNTER.get()) { diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index 455ea9e3f..13afbe7ac 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -56,7 +56,7 @@ public class GunsTool { // TODO 临时使用,移植完毕后删除 private static final Set STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount", "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY", "Velocity", "Damage", "BypassesArmor", - "RPM", "Magazine", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage"); + "RPM", "Magazine", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage", "ExplosionRadius"); public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return;