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

修复perk相关问题

Browse source
This commit is contained in:
Light_Quanta 2025-05-09 23:03:56 +08:00
parent 43afba3b4c
commit c89d665349
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientBocekImageTooltip.java
View file

@ -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);
}
}
}

2
src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java
View file

@ -58,7 +58,7 @@ public final class Perks {
return getLevel(item.getPerk());
}
public short getLevel(DeferredHolder<Perk, Perk> perk) {
public short getLevel(DeferredHolder<Perk, ? extends Perk> perk) {
return getLevel(perk.get());
}