From c89d665349f3934d9b51b7ec2f7d5b646b880c63 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Fri, 9 May 2025 23:03:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dperk=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/tooltip/ClientBocekImageTooltip.java | 6 +++--- .../superbwarfare/item/gun/data/subdata/Perks.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java index da5dc6ad7..2f4a585a2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java @@ -34,9 +34,9 @@ public class ClientBocekImageTooltip extends ClientGunImageTooltip { for (var type : Perk.Type.values()) { var instance = data.perk.getInstance(type); if (instance != null) { - shotDamage = instance.perk().getDisplayDamage(shotDamage, getGunData(), instance); - if (instance.perk().getExtraDisplayDamage(shotDamage, getGunData(), instance) >= 0) { - extraDamage = instance.perk().getExtraDisplayDamage(shotDamage, getGunData(), instance); + shotDamage = instance.perk().getDisplayDamage(shotDamage, data, instance); + if (instance.perk().getExtraDisplayDamage(shotDamage, data, instance) >= 0) { + extraDamage = instance.perk().getExtraDisplayDamage(shotDamage, data, instance); } } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java index 4dc295f72..a37c5f3f1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java @@ -58,7 +58,7 @@ public final class Perks { return getLevel(item.getPerk()); } - public short getLevel(DeferredHolder perk) { + public short getLevel(DeferredHolder perk) { return getLevel(perk.get()); }