diff --git a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java index dd062994f..976c3b2d2 100644 --- a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java @@ -255,7 +255,7 @@ public final class BankingPlugin extends OptionHandler { stage = 14; break; case 14: - interpreter.sendDialogues(id,FacialExpression.FRIENDLY,"Yes, Five million. These banks are very","to upkeep and maintain, but that is the final price","can't someone with your stature and wealth","afford such a trivial fee?"); + npcl(FacialExpression.FRIENDLY, "Yes, Five million. These banks are very expensive to upkeep and maintain, but that is the final price. Can't someone with your stature and wealth afford such a trivial fee?"); stage = 15; break; case 15: @@ -285,10 +285,13 @@ public final class BankingPlugin extends OptionHandler { stage = 22; break; case 22: - player.getInventory().remove(new Item(995,5000000)); - player.getGameAttributes().setAttribute("/save:UnlockedSecondaryBank",true); - interpreter.sendDialogues(id,FacialExpression.FRIENDLY,"You're all set! Whenever you want to switch to","your second bank account just ask","a teller and we'll swap it over for","you"); - stage = 100; + if(player.getInventory().remove(new Item(995,5000000))) { + player.getGameAttributes().setAttribute("/save:UnlockedSecondaryBank",true); + interpreter.sendDialogues(id,FacialExpression.FRIENDLY,"You're all set! Whenever you want to switch to","your second bank account just ask","a teller and we'll swap it over for","you"); + stage = 100; + } else { + end(); + } break; case 100: end(); diff --git a/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java b/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java index eb0cb07ee..fbe159d3e 100644 --- a/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java +++ b/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java @@ -11,6 +11,7 @@ import core.game.node.entity.state.EntityState; import rs09.game.world.World; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; +import org.rs09.consts.NPCs; /** * Represents a bolt effect. @@ -117,7 +118,7 @@ public enum BoltEffect { int victimPoints = (int) (state.getVictim().getSkills().getLifepoints() * 0.20); int playerPoints = (int) (state.getAttacker().getSkills().getLifepoints() * 0.10); int total = state.getEstimatedHit() + victimPoints; - if (total >= 100 && state.getVictim().getId() == 8133) { + if (total >= 100 && state.getVictim().getId() == NPCs.CORPOREAL_BEAST_8133) { total = 100; } state.setEstimatedHit(total);