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

正确处理PreKillEvent，移除多余todo

Browse source
This commit is contained in:
Light_Quanta 2025-04-07 02:12:30 +08:00
parent ddf078b41b
commit 4882c00db8
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
View file

@ -47,6 +47,7 @@ import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.block.entity.HopperBlockEntity; import net.minecraft.world.level.block.entity.HopperBlockEntity;
import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.common.util.TriState; import net.neoforged.neoforge.common.util.TriState;
import net.neoforged.neoforge.event.entity.living.*; import net.neoforged.neoforge.event.entity.living.*;
import net.neoforged.neoforge.event.entity.player.ItemEntityPickupEvent; import net.neoforged.neoforge.event.entity.player.ItemEntityPickupEvent;
@ -308,10 +309,9 @@ public class LivingEventHandler {
} }
if (!sourceEntity.level().isClientSide() && sourceEntity instanceof ServerPlayer player) { if (!sourceEntity.level().isClientSide() && sourceEntity instanceof ServerPlayer player) {
// TODO 判断 pre kill event 结果 if (NeoForge.EVENT_BUS.post(new PreKillEvent.Indicator(player, source, event.getEntity())).isCanceled()) {
// if (NeoForge.EVENT_BUS.post(new PreKillEvent.Indicator(player, source, event.getEntity()))) { return;
// return; }
// }
SoundTool.playLocalSound(player, ModSounds.TARGET_DOWN.get(), 3f, 1f); SoundTool.playLocalSound(player, ModSounds.TARGET_DOWN.get(), 3f, 1f);
PacketDistributor.sendToPlayer(player, new ClientIndicatorMessage(2, 8)); PacketDistributor.sendToPlayer(player, new ClientIndicatorMessage(2, 8));
@ -469,10 +469,9 @@ public class LivingEventHandler {
attacker = player; attacker = player;
} }
// TODO pre kill event if (NeoForge.EVENT_BUS.post(new PreKillEvent.SendKillMessage(attacker, source, entity)).isCanceled()) {
// if (NeoForge.EVENT_BUS.post(new PreKillEvent.SendKillMessage(attacker, source, entity))) { return;
// return; }
// }
if (attacker != null && MiscConfig.SEND_KILL_FEEDBACK.get()) { if (attacker != null && MiscConfig.SEND_KILL_FEEDBACK.get()) {
if (DamageTypeTool.isHeadshotDamage(source)) { if (DamageTypeTool.isHeadshotDamage(source)) {

1
src/main/java/com/atsuishio/superbwarfare/item/common/ammo/box/AmmoBox.java
View file

@ -29,7 +29,6 @@ public class AmmoBox extends Item {
super(new Properties().stacksTo(1)); super(new Properties().stacksTo(1));
} }
// TODO 修复弹药存储问题
@Override @Override
public @NotNull InteractionResultHolder<ItemStack> use(@NotNull Level level, Player player, @NotNull InteractionHand hand) { public @NotNull InteractionResultHolder<ItemStack> use(@NotNull Level level, Player player, @NotNull InteractionHand hand) {
ItemStack stack = player.getItemInHand(hand); ItemStack stack = player.getItemInHand(hand);