From 9adf5984851ff8cdba15f250c7f7df6928299b9c Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 2 Aug 2024 21:21:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=99=84=E9=AD=94=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/enchantment/GutshotStraight.java | 2 +- .../mcreator/superbwarfare/event/LivingEventHandler.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/enchantment/GutshotStraight.java b/src/main/java/net/mcreator/superbwarfare/enchantment/GutshotStraight.java index 51662f1c0..aa919d066 100644 --- a/src/main/java/net/mcreator/superbwarfare/enchantment/GutshotStraight.java +++ b/src/main/java/net/mcreator/superbwarfare/enchantment/GutshotStraight.java @@ -15,7 +15,7 @@ public class GutshotStraight extends Enchantment { @Override public int getMaxLevel() { - return super.getMaxLevel(); + return 2; } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java index 804605ede..f1ba8d9b0 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/LivingEventHandler.java @@ -310,7 +310,12 @@ public class LivingEventHandler { } if (stack.getOrCreateTag().getInt("KillClipTime") > 0) { - event.setAmount(event.getAmount() * 1.25f); + int enchantmentLevel = EnchantmentHelper.getTagEnchantmentLevel(ModEnchantments.GUTSHOT_STRAIGHT.get(), stack); + if (enchantmentLevel == 0) { + return; + } + + event.setAmount(event.getAmount() * (1.2f + 0.05f * enchantmentLevel)); } } } @@ -337,7 +342,7 @@ public class LivingEventHandler { return; } - event.setAmount(event.getAmount() * 1.2f); + event.setAmount(event.getAmount() * (1.15f + 0.05f * enchantmentLevel)); } } }