diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java b/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java index 70f3971ced46fe9b40939bfe90f18b8463630a56..4f93046b132ce2ec30b83b08680c6afd114e5815 100644 --- a/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java +++ b/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java @@ -290,7 +290,7 @@ public final class QueenAnt extends AbstractNpcAI { } } } - if ((!npc.getVariables().getBoolean(ATTACK_FLAG, false)) && (npc != null) && (_queen != null) && !npc.isCoreAIDisabled()) { + if ((!npc.getVariables().getBoolean(ATTACK_FLAG, false)) && (_queen != null) && !npc.isCoreAIDisabled()) { if (npc.calculateDistance(attacker, false, false) > 150) { _queen.setIsImmobilized(true); } diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java index d4ab3400b217df4381e722bad614e0c17095ecd1..5003a0d2574635c2db8dbfd7f90f6d191f1ab296 100644 --- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java +++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java @@ -21,7 +21,7 @@ package com.l2jserver.datapack.ai.npc.CastleChamberlain; import static com.l2jserver.gameserver.config.Configuration.castle; import static com.l2jserver.gameserver.config.Configuration.character; import static com.l2jserver.gameserver.config.Configuration.general; -import static com.l2jserver.gameserver.config.Configuration.sevenSings; +import static com.l2jserver.gameserver.config.Configuration.sevenSigns; import java.util.Arrays; import java.util.Calendar; @@ -959,11 +959,11 @@ public final class CastleChamberlain extends AbstractNpcAI { } else { if ((SevenSigns.getInstance().getPlayerCabal(player.getObjectId()) == SevenSigns.CABAL_DAWN) && SevenSigns.getInstance().isCompetitionPeriod()) { final int ticketCount = castle.getTicketBuyCount(); - if (ticketCount < (sevenSings().getSevenSignsDawnTicketQuantity() / sevenSings().getSevenSignsDawnTicketBundle())) { + if (ticketCount < (sevenSigns().getSevenSignsDawnTicketQuantity() / sevenSigns().getSevenSignsDawnTicketBundle())) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "ssq_selldawnticket.html"); - html.replace("%DawnTicketLeft%", String.valueOf(sevenSings().getSevenSignsDawnTicketQuantity() - (ticketCount * sevenSings().getSevenSignsDawnTicketBundle()))); - html.replace("%DawnTicketBundle%", String.valueOf(sevenSings().getSevenSignsDawnTicketBundle())); - html.replace("%DawnTicketPrice%", String.valueOf(sevenSings().getSevenSignsDawnTicketPrice() * sevenSings().getSevenSignsDawnTicketBundle())); + html.replace("%DawnTicketLeft%", String.valueOf(sevenSigns().getSevenSignsDawnTicketQuantity() - (ticketCount * sevenSigns().getSevenSignsDawnTicketBundle()))); + html.replace("%DawnTicketBundle%", String.valueOf(sevenSigns().getSevenSignsDawnTicketBundle())); + html.replace("%DawnTicketPrice%", String.valueOf(sevenSigns().getSevenSignsDawnTicketPrice() * sevenSigns().getSevenSignsDawnTicketBundle())); player.sendPacket(html); } else { htmltext = "ssq_notenoughticket.html"; @@ -984,11 +984,11 @@ public final class CastleChamberlain extends AbstractNpcAI { } else { if ((SevenSigns.getInstance().getPlayerCabal(player.getObjectId()) == SevenSigns.CABAL_DAWN) && SevenSigns.getInstance().isCompetitionPeriod()) { final int ticketCount = castle.getTicketBuyCount(); - if (ticketCount < (sevenSings().getSevenSignsDawnTicketQuantity() / sevenSings().getSevenSignsDawnTicketBundle())) { - final long totalCost = sevenSings().getSevenSignsDawnTicketPrice() * sevenSings().getSevenSignsDawnTicketBundle(); + if (ticketCount < (sevenSigns().getSevenSignsDawnTicketQuantity() / sevenSigns().getSevenSignsDawnTicketBundle())) { + final long totalCost = sevenSigns().getSevenSignsDawnTicketPrice() * sevenSigns().getSevenSignsDawnTicketBundle(); if (player.getAdena() >= totalCost) { takeItems(player, Inventory.ADENA_ID, totalCost); - giveItems(player, sevenSings().getSevenSignsManorsAgreementId(), sevenSings().getSevenSignsDawnTicketBundle()); + giveItems(player, sevenSigns().getSevenSignsManorsAgreementId(), sevenSigns().getSevenSignsDawnTicketBundle()); castle.setTicketBuyCount(ticketCount + 1); } else { htmltext = "chamberlain-09.html"; diff --git a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java index 2e0c2cb0422b4793237a4d80e3fb4d8304dd4f44..f2b2b98346a893d9c00ee86a5afa1c000f4cb45b 100644 --- a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java +++ b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java @@ -18,7 +18,7 @@ */ package com.l2jserver.datapack.handlers.bypasshandlers; -import static com.l2jserver.gameserver.config.Configuration.sevenSings; +import static com.l2jserver.gameserver.config.Configuration.sevenSigns; import java.util.Calendar; import java.util.List; @@ -91,7 +91,7 @@ public class Festival implements IBypassHandler { } // Check to see if the party has at least 5 members. - if (party.getMemberCount() < sevenSings().getFestivalMinPlayer()) { + if (party.getMemberCount() < sevenSigns().getFestivalMinPlayer()) { npc.showChatWindow(activeChar, 2, "b", false); return true; } @@ -263,7 +263,7 @@ public class Festival implements IBypassHandler { if (party.isLeader(activeChar)) { SevenSignsFestival.getInstance().updateParticipants(activeChar, null); } else { - if (party.getMemberCount() > sevenSings().getFestivalMinPlayer()) { + if (party.getMemberCount() > sevenSigns().getFestivalMinPlayer()) { party.removePartyMember(activeChar, messageType.Expelled); } else { activeChar.sendMessage("Only the party leader can leave a festival when a party has minimum number of members.");