From e83ec0e5ceef1c24ce31020108c621401e4c1bf6 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 18 Jan 2022 18:27:55 +0000 Subject: [PATCH] Replaced target cost validation with method call. Added check if totem can revive more expensive targets. --- .../totemofreviving/network/ReviveTargetPacket.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java b/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java index 6af1683..3b75bc2 100644 --- a/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java +++ b/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java @@ -49,13 +49,7 @@ public class ReviveTargetPacket { int charge = TotemItem.getCharge(totemStack); int targetCost = TotemItem.getTargetCost(totemStack); - if (TotemItem.isCostDynamic(totemStack) && targetCost != target.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS))) { - targetCost = target.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS)); - TotemItem.setTargetCost(totemStack, targetCost); - } else if (!TotemItem.isCostDynamic(totemStack) && targetCost != TotemItem.getMaxCharge(totemStack)) { - targetCost = TotemItem.getMaxCharge(totemStack); - TotemItem.setTargetCost(totemStack, targetCost); - } + TotemItem.validateTargetCost(totemStack, target.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS))); if (!target.isSpectator()) { sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + target.getDisplayName().getString() + TextFormatting.WHITE + " is not dead!"), sender.getUUID()); @@ -67,7 +61,7 @@ public class ReviveTargetPacket { return; } - if (charge < targetCost) { + if (charge < targetCost && !TotemItem.canReviveMoreExpensiveTargets(totemStack)) { sender.sendMessage(new StringTextComponent(TextFormatting.WHITE + "Not enough charge!"), sender.getUUID()); return; }