From 01c90f1b47ac1bcb38abba59ea5ae10dfd3cf944 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Thu, 19 Dec 2024 14:26:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=92=9E=E5=87=BB=E7=BB=8F?= =?UTF-8?q?=E9=AA=8C=E5=90=B8=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/LivingEventHandler.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java index 111a6513b..80b9a5383 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java @@ -740,21 +740,14 @@ public class LivingEventHandler { public static void onLivingExperienceDrop(LivingExperienceDropEvent event) { Player player = event.getAttackingPlayer(); if (player == null) return; - DamageSource source = event.getAttackingPlayer().getLastDamageSource(); - if (source == null) return; - - if (player.getVehicle() instanceof IVehicleEntity && source.is(ModDamageTypes.VEHICLE_STRIKE)) { - player.giveExperiencePoints(event.getDroppedExperience()); - event.setCanceled(true); - } - ItemStack stack = player.getMainHandItem(); - if (stack.is(ModTags.Items.GUN)) { - int level = PerkHelper.getItemPerkLevel(ModPerks.POWERFUL_ATTRACTION.get(), stack); - if (level > 0) { - player.giveExperiencePoints((int) (event.getDroppedExperience() * (0.8f + 0.2f * level))); - event.setCanceled(true); - } + if (!stack.is(ModTags.Items.GUN)) return; + + int level = PerkHelper.getItemPerkLevel(ModPerks.POWERFUL_ATTRACTION.get(), stack); + if (level > 0) { + player.giveExperiencePoints((int) (event.getDroppedExperience() * (0.8f + 0.2f * level))); + + event.setCanceled(true); } }