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

更改激光防御塔的目标

Browse source
This commit is contained in:
Atsuihsio 2025-02-12 01:41:37 +08:00
parent 38b1ad9098
commit afad6e8a40
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
View file

@ -23,7 +23,7 @@ import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.damagesource.DamageTypes;
import net.minecraft.world.entity.*; import net.minecraft.world.entity.*;
import net.minecraft.world.entity.monster.Monster; import net.minecraft.world.entity.monster.Enemy;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.ClipContext;
@ -206,7 +206,7 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
public InteractionResult interact(Player player, InteractionHand hand) { public InteractionResult interact(Player player, InteractionHand hand) {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (player.isCrouching()) { if (player.isCrouching()) {
if (stack.is(ModItems.CROWBAR.get())) { if (stack.is(ModItems.CROWBAR.get()) && (getOwner() == null || player == getOwner())) {
ItemStack container = ContainerBlockItem.createInstance(this); ItemStack container = ContainerBlockItem.createInstance(this);
if (!player.addItem(container)) { if (!player.addItem(container)) {
player.drop(container, false); player.drop(container, false);
@ -268,7 +268,7 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
public void autoAim() { public void autoAim() {
if (this.entityData.get(ENERGY) <= 0 || !entityData.get(ACTIVE) || this.entityData.get(COOL_DOWN) > 10) return; if (this.entityData.get(ENERGY) <= 0 || !entityData.get(ACTIVE) || this.entityData.get(COOL_DOWN) > 10) return;
Entity naerestEntity = seekNearLivingEntity(80); Entity naerestEntity = seekNearLivingEntity(128);
if (naerestEntity != null) { if (naerestEntity != null) {
Vec3 barrelRootPos = new Vec3(this.getX(), this.getY() + 1.390625f, this.getZ()); Vec3 barrelRootPos = new Vec3(this.getX(), this.getY() + 1.390625f, this.getZ());
@ -303,7 +303,7 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
return StreamSupport.stream(EntityFindUtil.getEntities(level()).getAll().spliterator(), false) return StreamSupport.stream(EntityFindUtil.getEntities(level()).getAll().spliterator(), false)
.filter(e -> { .filter(e -> {
// TODO 自定义目标列表 // TODO 自定义目标列表
if (e.distanceTo(this) <= seekRange && e instanceof Monster) { if (e.distanceTo(this) <= seekRange && e instanceof Enemy) {
return level().clip(new ClipContext(this.getEyePosition(), e.getEyePosition(), return level().clip(new ClipContext(this.getEyePosition(), e.getEyePosition(),
ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() != HitResult.Type.BLOCK; ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() != HitResult.Type.BLOCK;
} }