kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复cannon能被击飞的问题

Browse source
This commit is contained in:
17146 2024-11-10 02:27:33 +08:00
parent f96ec9cd69
commit 6f33b4aa5d
2 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java
View file

@ -154,15 +154,27 @@ public class Mk42Entity extends Entity implements GeoEntity, ICannonEntity {
@Override @Override
public InteractionResult interact(Player player, InteractionHand hand) { public InteractionResult interact(Player player, InteractionHand hand) {
if (player.isShiftKeyDown() && player.getMainHandItem().getItem() == ModItems.CROWBAR.get() && this.getFirstPassenger() == null) { if (player.isShiftKeyDown()) {
this.discard(); if (player.getMainHandItem().getItem() == ModItems.CROWBAR.get() && this.getFirstPassenger() == null) {
this.discard();
return InteractionResult.sidedSuccess(this.level().isClientSide());
}
return InteractionResult.PASS;
} else { } else {
player.setXRot(this.getXRot()); if (this.getFirstPassenger() == null) {
player.setYRot(this.getYRot()); player.setXRot(this.getXRot());
player.startRiding(this); player.setYRot(this.getYRot());
player.startRiding(this);
return InteractionResult.sidedSuccess(this.level().isClientSide());
}
} }
return InteractionResult.sidedSuccess(this.level().isClientSide()); return InteractionResult.PASS;
}
@Override
public Vec3 getDeltaMovement() {
return new Vec3(0, Math.min(super.getDeltaMovement().y, 0), 0);
} }
@Override @Override

24
src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java
View file

@ -160,15 +160,27 @@ public class Mle1934Entity extends Entity implements GeoEntity, ICannonEntity {
@Override @Override
public InteractionResult interact(Player player, InteractionHand hand) { public InteractionResult interact(Player player, InteractionHand hand) {
if (player.isShiftKeyDown() && player.getMainHandItem().getItem() == ModItems.CROWBAR.get() && this.getFirstPassenger() == null) { if (player.isShiftKeyDown()) {
this.discard(); if (player.getMainHandItem().getItem() == ModItems.CROWBAR.get() && this.getFirstPassenger() == null) {
this.discard();
return InteractionResult.sidedSuccess(this.level().isClientSide());
}
return InteractionResult.PASS;
} else { } else {
player.setXRot(this.getXRot()); if (this.getFirstPassenger() == null) {
player.setYRot(this.getYRot()); player.setXRot(this.getXRot());
player.startRiding(this); player.setYRot(this.getYRot());
player.startRiding(this);
return InteractionResult.sidedSuccess(this.level().isClientSide());
}
} }
return InteractionResult.sidedSuccess(this.level().isClientSide()); return InteractionResult.PASS;
}
@Override
public Vec3 getDeltaMovement() {
return new Vec3(0, Math.min(super.getDeltaMovement().y, 0), 0);
} }
@Override @Override