修复穿透数值读取问题,添加几处判断
This commit is contained in:
parent
a0f29cf372
commit
e745a37fb5
6 changed files with 5 additions and 2 deletions
|
@ -657,6 +657,7 @@ public class ClientEventHandler {
|
|||
|
||||
public static void shootClient(Player player, final CompoundTag tag) {
|
||||
ItemStack stack = player.getMainHandItem();
|
||||
if (!stack.is(ModTags.Items.GUN)) return;
|
||||
var data = GunData.from(stack);
|
||||
if (stack.is(ModTags.Items.NORMAL_GUN)) {
|
||||
if (data.ammo.get() > 0) {
|
||||
|
|
|
@ -34,7 +34,7 @@ public class DefaultGunData {
|
|||
public int fireMode;
|
||||
@SerializedName("BurstAmount")
|
||||
public int burstAmount;
|
||||
@SerializedName("BypassArmor")
|
||||
@SerializedName("BypassesArmor")
|
||||
public double bypassArmor;
|
||||
|
||||
@SerializedName("NormalReloadTime")
|
||||
|
|
|
@ -241,6 +241,7 @@ public class JavelinItem extends GunItem implements GeoItem, SpecialFireWeapon {
|
|||
private void fire(Player player) {
|
||||
Level level = player.level();
|
||||
ItemStack stack = player.getMainHandItem();
|
||||
if (!stack.is(ModTags.Items.GUN)) return;
|
||||
var data = GunData.from(stack);
|
||||
CompoundTag tag = data.tag();
|
||||
|
||||
|
|
|
@ -57,7 +57,6 @@ public class Aa12Item extends GunItem implements GeoItem {
|
|||
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
|
||||
|
||||
if (this.animationProcedure.equals("empty")) {
|
||||
|
||||
if (GunData.from(stack).reload.empty()) {
|
||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload_empty"));
|
||||
}
|
||||
|
|
|
@ -113,6 +113,7 @@ public record FireMessage(int msgType, double power, boolean zoom) implements Cu
|
|||
public static void spawnBullet(Player player, final CompoundTag tag, double power, boolean zoom) {
|
||||
ItemStack stack = player.getMainHandItem();
|
||||
if (player.level().isClientSide()) return;
|
||||
if (!stack.is(ModTags.Items.GUN)) return;
|
||||
var data = GunData.from(stack);
|
||||
|
||||
var perk = data.perk.get(Perk.Type.AMMO);
|
||||
|
|
|
@ -40,6 +40,7 @@ public record ShootMessage(double spread, boolean zoom) implements CustomPacketP
|
|||
|
||||
public static void pressAction(Player player, double spared, boolean zoom) {
|
||||
ItemStack stack = player.getMainHandItem();
|
||||
if (!stack.is(ModTags.Items.GUN)) return;
|
||||
var data = GunData.from(stack);
|
||||
var tag = data.tag();
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue