minecraft-mods/totem_of_reviving
Private
Public Access
1
0
Fork 0
Code Issues Projects Releases 2 Wiki Activity

Replaced target cost validation with method call. Added check if totem can revive more expensive targets.

Browse Source
This commit is contained in:
Micle
2022-01-18 18:27:55 +00:00
parent 3f8ac8ddde
commit e83ec0e5ce
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java
View File

@ -49,13 +49,7 @@ public class ReviveTargetPacket {
int charge = TotemItem.getCharge(totemStack); int charge = TotemItem.getCharge(totemStack);
int targetCost = TotemItem.getTargetCost(totemStack); int targetCost = TotemItem.getTargetCost(totemStack);
if (TotemItem.isCostDynamic(totemStack) && targetCost != target.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS))) { TotemItem.validateTargetCost(totemStack, 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);
}
if (!target.isSpectator()) { if (!target.isSpectator()) {
sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + target.getDisplayName().getString() + TextFormatting.WHITE + " is not dead!"), sender.getUUID()); sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + target.getDisplayName().getString() + TextFormatting.WHITE + " is not dead!"), sender.getUUID());
@ -67,7 +61,7 @@ public class ReviveTargetPacket {
return; return;
} }
if (charge < targetCost) { if (charge < targetCost && !TotemItem.canReviveMoreExpensiveTargets(totemStack)) {
sender.sendMessage(new StringTextComponent(TextFormatting.WHITE + "Not enough charge!"), sender.getUUID()); sender.sendMessage(new StringTextComponent(TextFormatting.WHITE + "Not enough charge!"), sender.getUUID());
return; return;
} }