diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/exp4j/Expression.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/exp4j/Expression.java index 1394c396d3..cbc52fb5f4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/exp4j/Expression.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/exp4j/Expression.java @@ -73,7 +73,7 @@ public class Expression public Expression setVariable(String name, double value) { checkVariableName(name); - variables.put(name, Double.valueOf(value)); + variables.put(name, value); return this; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e18877d818..b99c464e8a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import org.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map
%choices%
%board%"; - protected static final String template_final = "%msg%
%board%"; - protected static final String template_board = "For your information, below is your current selection.
| %cell1% | %cell2% | %cell3% |
| %cell4% | %cell5% | %cell6% |
| %cell7% | %cell8% | %cell9% |
Now, select your %choicenum% number."; - protected static final String msg_next = "Now, choose your %choicenum% number."; - protected static final String msg_0lines = "You are spectacularly unlucky! The red-colored numbers on the panel below are the ones you chose. As you can see, they didn't create even a single line. Did you know that it is harder not to create a single line than creating all 3 lines?"; - protected static final String msg_3lines = "You've created 3 lines! The red colored numbers on the bingo panel below are the numbers you chose. Congratulations!"; - protected static final String msg_lose = "Hmm... You didn't make 3 lines. Why don't you try again? The red-colored numbers on the panel are the ones you chose."; - protected static final String[] nums = + protected static final String TEMPLATE = "%msg%
%choices%
%board%"; + protected static final String TEMPLATE_FINAL = "%msg%
%board%"; + protected static final String TEMPLATE_BOARD = "For your information, below is your current selection.
| %cell1% | %cell2% | %cell3% |
| %cell4% | %cell5% | %cell6% |
| %cell7% | %cell8% | %cell9% |
Now, select your %choicenum% number."; + protected static final String MSG_NEXT = "Now, choose your %choicenum% number."; + protected static final String MSG_ZERO_LINES = "You are spectacularly unlucky! The red-colored numbers on the panel below are the ones you chose. As you can see, they didn't create even a single line. Did you know that it is harder not to create a single line than creating all 3 lines?"; + protected static final String MSG_THREE_LINES = "You've created 3 lines! The red colored numbers on the bingo panel below are the numbers you chose. Congratulations!"; + protected static final String MSG_LOSE = "Hmm... You didn't make 3 lines. Why don't you try again? The red-colored numbers on the panel are the ones you chose."; + protected static final String[] NUMBERS = { "first", "second", @@ -50,11 +50,11 @@ public class Bingo private final List
| %cell1% | %cell2% | %cell3% |
| %cell4% | %cell5% | %cell6% |
| %cell7% | %cell8% | %cell9% |
%choices%
%board%"; - if (guesses.size() == 0) + if (guesses.isEmpty()) { result = result.replaceFirst("%msg%", "I've arranged 9 numbers on the panel.
Now, select your %choicenum% number."); } @@ -129,13 +129,13 @@ public class Bingo { result = result.replaceFirst("%msg%", "".equalsIgnoreCase(msg) ? "Now, choose your %choicenum% number." : msg); } - result = result.replaceFirst("%choicenum%", Bingo.nums[guesses.size()]); + result = result.replaceFirst("%choicenum%", Bingo.NUMBERS[guesses.size()]); final StringBuilder choices = new StringBuilder(); for (int i = 1; i <= 9; ++i) { if (!guesses.contains(i)) { - choices.append(_template_choice.replaceAll("%n%", String.valueOf(i))); + choices.append(_template_choice.replace("%n%", String.valueOf(i))); } } result = result.replaceFirst("%choices%", choices.toString()); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java index afd35c7371..dad8030fd0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java @@ -130,9 +130,9 @@ public class FeedableBeasts extends Quest _chance = chance; } - public void addMobs(int spice, int[][] Mobs) + public void addMobs(int spice, int[][] mobs) { - _spiceToMob.put(spice, Mobs); + _spiceToMob.put(spice, mobs); } public Integer getMob(int spice, int mobType, int classType) @@ -442,29 +442,26 @@ public class FeedableBeasts extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null)) + if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getNpcId())) { - if (MAD_COW_POLYMORPH.containsKey(npc.getNpcId())) + // remove the feed info from the previous mob + if (FEED_INFO.getOrDefault(npc.getObjectId(), 0) == player.getObjectId()) { - // remove the feed info from the previous mob - if (FEED_INFO.getOrDefault(npc.getObjectId(), 0) == player.getObjectId()) - { - FEED_INFO.remove(npc.getObjectId()); - } - - // despawn the mad cow - npc.deleteMe(); - - // spawn the new mob - Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getNpcId()), npc); - - // register the player in the feedinfo for the mob that just spawned - FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId()); - - nextNpc.setRunning(); - nextNpc.addDamageHate(player, 0, 99999); - nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); + FEED_INFO.remove(npc.getObjectId()); } + + // despawn the mad cow + npc.deleteMe(); + + // spawn the new mob + Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getNpcId()), npc); + + // register the player in the feedinfo for the mob that just spawned + FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId()); + + nextNpc.setRunning(); + nextNpc.addDamageHate(player, 0, 99999); + nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } return super.onAdvEvent(event, npc, player); @@ -506,7 +503,7 @@ public class FeedableBeasts extends Quest { food = GOLDEN_SPICE; } - else if (skillId == SKILL_CRYSTAL_SPICE) + else // if (skillId == SKILL_CRYSTAL_SPICE) { food = CRYSTAL_SPICE; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java index 40505ce2b2..897c361973 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.util.Util; public class Monastery extends Quest { - static final int[] mobs1 = + private static final int[] MOBS_1 = { 22124, 22125, @@ -47,13 +47,12 @@ public class Monastery extends Quest 22127, 22129 }; - static final int[] mobs2 = + private static final int[] MOBS_2 = { 22134, 22135 }; - // TODO: npcstring - static final String[] text = + private static final String[] TEXT = { "You cannot carry a weapon without authorization!", "name, why would you choose the path of darkness?!", @@ -63,19 +62,19 @@ public class Monastery extends Quest public Monastery() { super(-1, "ai"); - registerMobs(mobs1, QuestEventType.ON_AGGRO_RANGE_ENTER, QuestEventType.ON_SPAWN, QuestEventType.ON_SPELL_FINISHED); - registerMobs(mobs2, QuestEventType.ON_SPELL_FINISHED); + registerMobs(MOBS_1, QuestEventType.ON_AGGRO_RANGE_ENTER, QuestEventType.ON_SPAWN, QuestEventType.ON_SPELL_FINISHED); + registerMobs(MOBS_2, QuestEventType.ON_SPELL_FINISHED); } @Override public String onAggroRangeEnter(NpcInstance npc, PlayerInstance player, boolean isPet) { - if (Util.contains(mobs1, npc.getNpcId()) && !npc.isInCombat() && (npc.getTarget() == null)) + if (Util.contains(MOBS_1, npc.getNpcId()) && !npc.isInCombat() && (npc.getTarget() == null)) { if ((player.getActiveWeaponInstance() != null) && !player.isSilentMoving()) { npc.setTarget(player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), 0, npc.getName(), text[0])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), 0, npc.getName(), TEXT[0])); switch (npc.getNpcId()) { @@ -106,21 +105,18 @@ public class Monastery extends Quest @Override public String onSpawn(NpcInstance npc) { - if (Util.contains(mobs1, npc.getNpcId())) + if (Util.contains(MOBS_1, npc.getNpcId())) { final List
Let me have the " + REQUIRED_STOLEN_INFERIUM_ORE + " Infernium Ores. Too many players try to run away without paying when it becomes obvious that they're losing...
OK, select six numbers between 1 and 9. Choose the %choicenum% number."; - protected static final String msg_again = "You've already chosen that number. Make your %choicenum% choice again."; - protected static final String msg_0lines = "Wow! How unlucky can you get? Your choices are highlighted in red below. As you can see, your choices didn't make a single line! Losing this badly is actually quite rare!
You look so sad, I feel bad for you... Wait here...
.
.
.
Take this... I hope it will bring you better luck in the future."; - protected static final String msg_3lines = "Excellent! As you can see, you've formed three lines! Congratulations! As promised, I'll give you some unclaimed merchandise from the warehouse. Wait here...
.
.
.
Whew, it's dusty! OK, here you go. Do you like it?"; - protected static final String msg_lose = "Oh, too bad. Your choices didn't form three lines. You should try again... Your choices are highlighted in red."; - // private static final String template_choice = "%n% "; + protected static final String MSG_BEGIN = "I've arranged the numbers 1 through 9 on the grid. Don't peek!
Let me have the " + REQUIRED_STOLEN_INFERIUM_ORE + " Infernium Ores. Too many players try to run away without paying when it becomes obvious that they're losing...
OK, select six numbers between 1 and 9. Choose the %choicenum% number."; + protected static final String MSG_AGAIN = "You've already chosen that number. Make your %choicenum% choice again."; + protected static final String MSG_ZERO_LINES = "Wow! How unlucky can you get? Your choices are highlighted in red below. As you can see, your choices didn't make a single line! Losing this badly is actually quite rare!
You look so sad, I feel bad for you... Wait here...
.
.
.
Take this... I hope it will bring you better luck in the future."; + protected static final String MSG_THREE_LINES = "Excellent! As you can see, you've formed three lines! Congratulations! As promised, I'll give you some unclaimed merchandise from the warehouse. Wait here...
.
.
.
Whew, it's dusty! OK, here you go. Do you like it?"; + protected static final String MSG_LOSE = "Oh, too bad. Your choices didn't form three lines. You should try again... Your choices are highlighted in red."; + private static final String TEMPLATE_CHOICE = "%n% "; + private final QuestState _qs; public Bingo(QuestState qs) { - super("%n% "); + super(TEMPLATE_CHOICE); _qs = qs; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java index 30f03e4ae7..efad4903ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java @@ -213,12 +213,9 @@ public class Q401_PathToAWarrior extends Quest case 20038: case 20043: - if ((st.getInt("cond") == 5) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == RUSTED_BRONZE_SWORD_3)) + if ((st.getInt("cond") == 5) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == RUSTED_BRONZE_SWORD_3) && st.dropItemsAlways(POISON_SPIDER_LEG, 1, 20)) { - if (st.dropItemsAlways(POISON_SPIDER_LEG, 1, 20)) - { - st.set("cond", "6"); - } + st.set("cond", "6"); } break; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java index 96d8372429..be948fc98f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java @@ -409,66 +409,54 @@ public class Q415_PathToAMonk extends Quest break; case 20014: - if ((st.getInt("cond") == 11) && st.dropItemsAlways(FELIM_LIZARDMAN_TOOTH, 1, 3)) + if ((st.getInt("cond") == 11) && st.dropItemsAlways(FELIM_LIZARDMAN_TOOTH, 1, 3) && (st.getQuestItemsCount(RATMAN_FANG) == 3) && (st.getQuestItemsCount(LANG_KLIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(VUKU_ORC_TUSK) == 3)) { - if ((st.getQuestItemsCount(RATMAN_FANG) == 3) && (st.getQuestItemsCount(LANG_KLIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(VUKU_ORC_TUSK) == 3)) - { - st.set("cond", "12"); - st.takeItems(VUKU_ORC_TUSK, -1); - st.takeItems(RATMAN_FANG, -1); - st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); - st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); - st.takeItems(LEATHER_POUCH_4, 1); - st.giveItems(LEATHER_POUCH_FULL_4, 1); - } + st.set("cond", "12"); + st.takeItems(VUKU_ORC_TUSK, -1); + st.takeItems(RATMAN_FANG, -1); + st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); + st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); + st.takeItems(LEATHER_POUCH_4, 1); + st.giveItems(LEATHER_POUCH_FULL_4, 1); } break; case 20017: - if ((st.getInt("cond") == 11) && st.dropItemsAlways(VUKU_ORC_TUSK, 1, 3)) + if ((st.getInt("cond") == 11) && st.dropItemsAlways(VUKU_ORC_TUSK, 1, 3) && (st.getQuestItemsCount(RATMAN_FANG) == 3) && (st.getQuestItemsCount(LANG_KLIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(FELIM_LIZARDMAN_TOOTH) == 3)) { - if ((st.getQuestItemsCount(RATMAN_FANG) == 3) && (st.getQuestItemsCount(LANG_KLIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(FELIM_LIZARDMAN_TOOTH) == 3)) - { - st.set("cond", "12"); - st.takeItems(VUKU_ORC_TUSK, -1); - st.takeItems(RATMAN_FANG, -1); - st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); - st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); - st.takeItems(LEATHER_POUCH_4, 1); - st.giveItems(LEATHER_POUCH_FULL_4, 1); - } + st.set("cond", "12"); + st.takeItems(VUKU_ORC_TUSK, -1); + st.takeItems(RATMAN_FANG, -1); + st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); + st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); + st.takeItems(LEATHER_POUCH_4, 1); + st.giveItems(LEATHER_POUCH_FULL_4, 1); } break; case 20024: - if ((st.getInt("cond") == 11) && st.dropItemsAlways(LANG_KLIZARDMAN_TOOTH, 1, 3)) + if ((st.getInt("cond") == 11) && st.dropItemsAlways(LANG_KLIZARDMAN_TOOTH, 1, 3) && (st.getQuestItemsCount(RATMAN_FANG) == 3) && (st.getQuestItemsCount(FELIM_LIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(VUKU_ORC_TUSK) == 3)) { - if ((st.getQuestItemsCount(RATMAN_FANG) == 3) && (st.getQuestItemsCount(FELIM_LIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(VUKU_ORC_TUSK) == 3)) - { - st.set("cond", "12"); - st.takeItems(VUKU_ORC_TUSK, -1); - st.takeItems(RATMAN_FANG, -1); - st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); - st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); - st.takeItems(LEATHER_POUCH_4, 1); - st.giveItems(LEATHER_POUCH_FULL_4, 1); - } + st.set("cond", "12"); + st.takeItems(VUKU_ORC_TUSK, -1); + st.takeItems(RATMAN_FANG, -1); + st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); + st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); + st.takeItems(LEATHER_POUCH_4, 1); + st.giveItems(LEATHER_POUCH_FULL_4, 1); } break; case 20359: - if ((st.getInt("cond") == 11) && st.dropItemsAlways(RATMAN_FANG, 1, 3)) + if ((st.getInt("cond") == 11) && st.dropItemsAlways(RATMAN_FANG, 1, 3) && (st.getQuestItemsCount(LANG_KLIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(FELIM_LIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(VUKU_ORC_TUSK) == 3)) { - if ((st.getQuestItemsCount(LANG_KLIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(FELIM_LIZARDMAN_TOOTH) == 3) && (st.getQuestItemsCount(VUKU_ORC_TUSK) == 3)) - { - st.set("cond", "12"); - st.takeItems(VUKU_ORC_TUSK, -1); - st.takeItems(RATMAN_FANG, -1); - st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); - st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); - st.takeItems(LEATHER_POUCH_4, 1); - st.giveItems(LEATHER_POUCH_FULL_4, 1); - } + st.set("cond", "12"); + st.takeItems(VUKU_ORC_TUSK, -1); + st.takeItems(RATMAN_FANG, -1); + st.takeItems(LANG_KLIZARDMAN_TOOTH, -1); + st.takeItems(FELIM_LIZARDMAN_TOOTH, -1); + st.takeItems(LEATHER_POUCH_4, 1); + st.giveItems(LEATHER_POUCH_FULL_4, 1); } break; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index 343f8de026..957d50dd3f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -309,15 +309,12 @@ public class Q421_LittleWingsBigAdventure extends Quest final Creature originalKiller = isPet ? killer.getPet() : killer; // Tree curses the killer. - if (Rnd.get(100) < 30) + if ((Rnd.get(100) < 30) && (originalKiller != null)) { - if (originalKiller != null) + final Skill skill = SkillTable.getInstance().getInfo(4243, 1); + if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) { - final Skill skill = SkillTable.getInstance().getInfo(4243, 1); - if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) - { - skill.getEffects(npc, originalKiller); - } + skill.getEffects(npc, originalKiller); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index b6bc5db31d..ec2cf92805 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -76,6 +76,7 @@ public class Q501_ProofOfClanAlliance extends Quest // Drops private static final Map
*/ @Override - protected void onEvtArrivedBlocked(Location blocked_at_pos) + protected void onEvtArrivedBlocked(Location location) { // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE if ((getIntention() == AI_INTENTION_MOVE_TO) || (getIntention() == AI_INTENTION_CAST)) @@ -805,7 +799,7 @@ public class CreatureAI extends AbstractAI } // Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast) - clientStopMoving(blocked_at_pos); + clientStopMoving(location); // Launch actions corresponding to the Event Think onEvtThink(); @@ -1020,18 +1014,15 @@ public class CreatureAI extends AbstractAI if (follow != null) { // prevent attack-follow into peace zones - if ((getAttackTarget() != null) && (_actor instanceof Playable) && (target instanceof Playable)) + if ((getAttackTarget() != null) && (_actor instanceof Playable) && (target instanceof Playable) && (getAttackTarget() == follow)) { - if (getAttackTarget() == follow) + // allow GMs to keep following + final boolean isGM = (_actor instanceof PlayerInstance) && ((PlayerInstance) _actor).isGM(); + if (Creature.isInsidePeaceZone(_actor, target) && !isGM) { - // allow GMs to keep following - final boolean isGM = _actor instanceof PlayerInstance ? ((PlayerInstance) _actor).isGM() : false; - if (Creature.isInsidePeaceZone(_actor, target) && !isGM) - { - stopFollow(); - setIntention(AI_INTENTION_IDLE); - return true; - } + stopFollow(); + setIntention(AI_INTENTION_IDLE); + return true; } } // if the target is too far (maybe also teleported) @@ -1198,25 +1189,18 @@ public class CreatureAI extends AbstractAI } } - /** - * @return the _skill - */ - public synchronized Skill get_skill() + public synchronized Skill getSkill() { return _skill; } - /** - * @param _skill the _skill to set - */ - public synchronized void set_skill(Skill _skill) + public synchronized void setSkill(Skill skill) { - this._skill = _skill; + this._skill = skill; } public IntentionCommand getNextIntention() { return null; } - } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java index fa1e2e0b2c..84f5ea75c9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortSiegeGuardInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuardInstance; /** - * @author mkizub TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates + * @author mkizub */ public class DoorAI extends CreatureAI { @@ -186,10 +186,6 @@ public class DoorAI extends CreatureAI _attacker = attacker; } - /* - * (non-Javadoc) - * @see java.lang.Runnable#run() - */ @Override public void run() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 05a3ef2461..8f093fadc6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -365,7 +365,6 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable ((CommanderInstance) _actor).returnHome(); } } - return; } /** @@ -382,17 +381,14 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable */ private void thinkAttack() { - if (_attackTimeout < GameTimeController.getGameTicks()) + // Check if the actor is running + if ((_attackTimeout < GameTimeController.getGameTicks()) && _actor.isRunning()) { - // Check if the actor is running - if (_actor.isRunning()) - { - // Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others PlayerInstance - _actor.setWalking(); - - // Calculate a new attack timeout - _attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getGameTicks(); - } + // Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others PlayerInstance + _actor.setWalking(); + + // Calculate a new attack timeout + _attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getGameTicks(); } final Creature attackTarget = getAttackTarget(); @@ -525,11 +521,11 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable break; } - final WorldObject OldTarget = _actor.getTarget(); + final WorldObject oldTarget = _actor.getTarget(); _actor.setTarget(creature); clientStopMoving(null); _accessor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -560,9 +556,9 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable } } // heal friends - if (/* _selfAnalysis.hasHealOrResurrect && */!_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (/* _selfAnalysis.hasHealOrResurrect && */ !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { - for (Skill sk : /* _selfAnalysis.healSkills */healSkills) + for (Skill sk : /* _selfAnalysis.healSkills */ healSkills) { if (_actor.getCurrentMp() < sk.getMpConsume()) { @@ -587,11 +583,11 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable break; } - final WorldObject OldTarget = _actor.getTarget(); + final WorldObject oldTarget = _actor.getTarget(); _actor.setTarget(npc); clientStopMoving(null); _accessor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -603,7 +599,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable { // Get all information needed to choose between physical or magical attack Skill[] skills = null; - double dist_2 = 0; + double dist2 = 0; int range = 0; FortSiegeGuardInstance sGuard; sGuard = (FortSiegeGuardInstance) _actor; @@ -613,7 +609,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable { _actor.setTarget(attackTarget); skills = _actor.getAllSkills(); - dist_2 = _actor.getPlanDistanceSq(attackTarget.getX(), attackTarget.getY()); + dist2 = _actor.getPlanDistanceSq(attackTarget.getX(), attackTarget.getY()); range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + attackTarget.getTemplate().collisionRadius; if (attackTarget.isMoving()) { @@ -648,16 +644,16 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable } // Check if the actor isn't muted and if it is far from target - if (!_actor.isMuted() && (dist_2 > (range * range))) + if (!_actor.isMuted() && (dist2 > (range * range))) { // check for long ranged skills and heal/buff skills for (Skill sk : skills) { final int castRange = sk.getCastRange(); - if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if ((dist2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { - final WorldObject OldTarget = _actor.getTarget(); + final WorldObject oldTarget = _actor.getTarget(); if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { boolean useSkillSelf = true; @@ -687,7 +683,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable clientStopMoving(null); _accessor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -736,11 +732,9 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable } } } - - return; } // Else, if the actor is muted and far from target, just "move to pawn" - else if (_actor.isMuted() && (dist_2 > (range * range))) + else if (_actor.isMuted() && (dist2 > (range * range))) { // Temporary hack for preventing guards jumping off towers, // before replacing this with effective GeoClient checks and AI modification @@ -762,10 +756,9 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable moveToPawn(attackTarget, range); } } - return; } // Else, if this is close enough to attack - else if (dist_2 <= (range * range)) + else if (dist2 <= (range * range)) { // Force mobs to attack anybody if confused Creature hated = null; @@ -797,9 +790,9 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable { final int castRange = sk.getCastRange(); - if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) + if (((castRange * castRange) >= dist2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { - final WorldObject OldTarget = _actor.getTarget(); + final WorldObject oldTarget = _actor.getTarget(); if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { boolean useSkillSelf = true; @@ -829,7 +822,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable clientStopMoving(null); _accessor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java index fa6a685e53..7d87a6911f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java @@ -100,12 +100,12 @@ public class NpcWalkerAI extends CreatureAI implements Runnable /** * If npc can't walk to it's target then just teleport to next point - * @param blocked_at_pos ignoring it + * @param location ignoring it */ @Override - protected void onEvtArrivedBlocked(Location blocked_at_pos) + protected void onEvtArrivedBlocked(Location location) { - LOGGER.warning("NpcWalker ID: " + getActor().getNpcId() + ": Blocked at rote position [" + _currentPos + "], coords: " + blocked_at_pos.getX() + ", " + blocked_at_pos.getY() + ", " + blocked_at_pos.getZ() + ". Teleporting to next point"); + LOGGER.warning("NpcWalker ID: " + getActor().getNpcId() + ": Blocked at rote position [" + _currentPos + "], coords: " + location.getX() + ", " + location.getY() + ", " + location.getZ() + ". Teleporting to next point"); if (_route.size() <= _currentPos) { @@ -117,7 +117,7 @@ public class NpcWalkerAI extends CreatureAI implements Runnable final int destinationZ = _route.get(_currentPos).getMoveZ(); getActor().teleToLocation(destinationX, destinationY, destinationZ, false); - super.onEvtArrivedBlocked(blocked_at_pos); + super.onEvtArrivedBlocked(location); } private void checkArrived() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/PlayerAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/PlayerAI.java index 02fe3f9b4e..b72f90e04e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/PlayerAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/PlayerAI.java @@ -75,10 +75,6 @@ public class PlayerAI extends CreatureAI @Override public void changeIntention(CtrlIntention intention, Object arg0, Object arg1) { - /* - * if (Config.DEBUG) LOGGER.warning("PlayerAI: changeIntention -> " + intention + " " + arg0 + " " + arg1); - */ - // nothing to do if it does not CAST intention if (intention != AI_INTENTION_CAST) { @@ -86,23 +82,19 @@ public class PlayerAI extends CreatureAI return; } - final CtrlIntention _intention = getIntention(); - final Object _intentionArg0 = get_intentionArg0(); - final Object _intentionArg1 = get_intentionArg1(); + final CtrlIntention oldIntention = getIntention(); + final Object oldArg0 = getIntentionArg0(); + final Object oldArg1 = getIntentionArg1(); // do nothing if next intention is same as current one. - if ((intention == _intention) && (arg0 == _intentionArg0) && (arg1 == _intentionArg1)) + if ((intention == oldIntention) && (arg0 == oldArg0) && (arg1 == oldArg1)) { super.changeIntention(intention, arg0, arg1); return; } - /* - * if (Config.DEBUG) LOGGER.warning("PlayerAI: changeIntention -> Saving current intention: " + _intention + " " + _intention_arg0 + " " + _intention_arg1); - */ - // push current intention to stack - getInterruptedIntentions().push(new IntentionCommand(_intention, _intentionArg0, _intentionArg1)); + getInterruptedIntentions().push(new IntentionCommand(oldIntention, oldArg0, oldArg1)); super.changeIntention(intention, arg0, arg1); } @@ -115,7 +107,7 @@ public class PlayerAI extends CreatureAI protected void onEvtFinishCasting() { // forget interupted actions after offensive skill - final Skill skill = get_skill(); + final Skill skill = getSkill(); if ((skill != null) && skill.isOffensive()) { @@ -136,10 +128,6 @@ public class PlayerAI extends CreatureAI { } - /* - * if (Config.DEBUG) LOGGER.warning("PlayerAI: onEvtFinishCasting -> " + cmd._intention + " " + cmd._arg0 + " " + cmd._arg1); - */ - if ((cmd != null) && (cmd._crtlIntention != AI_INTENTION_CAST)) // previous state shouldn't be casting { setIntention(cmd._crtlIntention, cmd._arg0, cmd._arg1); @@ -151,9 +139,6 @@ public class PlayerAI extends CreatureAI } else { - /* - * if (Config.DEBUG) LOGGER.warning("PlayerAI: no previous intention set... Setting it to IDLE"); - */ // set intention to idle if skill doesn't change intention. setIntention(AI_INTENTION_IDLE); } @@ -213,13 +198,12 @@ public class PlayerAI extends CreatureAI } _accessor.doAttack(target); - return; } private void thinkCast() { final Creature target = getCastTarget(); - final Skill skill = get_skill(); + final Skill skill = getSkill(); // if (Config.DEBUG) LOGGER.warning("PlayerAI: thinkCast -> Start"); if (checkTargetLost(target)) @@ -232,12 +216,9 @@ public class PlayerAI extends CreatureAI return; } - if (target != null) + if ((target != null) && maybeMoveToPawn(target, _actor.getMagicalAttackRange(skill))) { - if (maybeMoveToPawn(target, _actor.getMagicalAttackRange(skill))) - { - return; - } + return; } if (skill.getHitTime() > 50) @@ -256,7 +237,7 @@ public class PlayerAI extends CreatureAI } // Launch the Cast of the skill - _accessor.doCast(get_skill()); + _accessor.doCast(getSkill()); // Restore the initial target if ((target != null) && (oldTarget != target)) @@ -268,8 +249,6 @@ public class PlayerAI extends CreatureAI { _accessor.doCast(skill); } - - return; } private void thinkPickUp() @@ -292,8 +271,6 @@ public class PlayerAI extends CreatureAI setIntention(AI_INTENTION_IDLE); ((PlayerInstance.AIAccessor) _accessor).doPickupItem(target); - - return; } private void thinkInteract() @@ -320,7 +297,6 @@ public class PlayerAI extends CreatureAI } setIntention(AI_INTENTION_IDLE); - return; } @Override @@ -363,5 +339,4 @@ public class PlayerAI extends CreatureAI ThreadPool.execute(new KnownListAsynchronousUpdateTask(_actor)); super.onEvtArrivedRevalidate(); } - } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 68e9bed50b..8a7bf0ca83 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -140,15 +140,12 @@ public class SiegeGuardAI extends CreatureAI implements Runnable } } - // Check if the target is a PlayerInstance - if (target instanceof PlayerInstance) + // Check if the target is a PlayerInstance and if the target isn't in silent move mode AND too far (>100) + if ((target instanceof PlayerInstance) && ((PlayerInstance) target).isSilentMoving() && !_actor.isInsideRadius(target, 250, false, false)) { - // Check if the target isn't in silent move mode AND too far (>100) - if (((PlayerInstance) target).isSilentMoving() && !_actor.isInsideRadius(target, 250, false, false)) - { - return false; - } + return false; } + // Los Check Here return _actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target); } @@ -317,15 +314,13 @@ public class SiegeGuardAI extends CreatureAI implements Runnable // Order to the SiegeGuardInstance to return to its home location because there's no target to attack ((SiegeGuardInstance) _actor).returnHome(); - - return; } private void attackPrepare() { // Get all information needed to chose between physical or magical attack Skill[] skills = null; - double dist_2 = 0; + double dist2 = 0; int range = 0; SiegeGuardInstance sGuard = (SiegeGuardInstance) _actor; @@ -335,7 +330,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { _actor.setTarget(attackTarget); skills = _actor.getAllSkills(); - dist_2 = _actor.getPlanDistanceSq(attackTarget.getX(), attackTarget.getY()); + dist2 = _actor.getPlanDistanceSq(attackTarget.getX(), attackTarget.getY()); range = _actor.getPhysicalAttackRange() + _actor.getTemplate().collisionRadius + attackTarget.getTemplate().collisionRadius; } catch (NullPointerException e) @@ -366,7 +361,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable } // Check if the actor isn't muted and if it is far from target - if (!_actor.isMuted() && (dist_2 > ((range + 20) * (range + 20)))) + if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) { // check for long ranged skills and heal/buff skills if (!Config.ALT_GAME_MOB_ATTACK_AI || ((_actor instanceof MonsterInstance) && (Rnd.get(100) <= 5))) @@ -375,13 +370,13 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { final int castRange = sk.getCastRange(); - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist_2 >= ((castRange * castRange) / 9)) && (dist_2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) { boolean useSkillSelf = true; - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist_2 >= ((castRange * castRange) / 9)) && (dist_2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { useSkillSelf = false; break; @@ -407,11 +402,11 @@ public class SiegeGuardAI extends CreatureAI implements Runnable } } - WorldObject OldTarget = _actor.getTarget(); + WorldObject oldTarget = _actor.getTarget(); clientStopMoving(null); _accessor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -448,11 +443,9 @@ public class SiegeGuardAI extends CreatureAI implements Runnable moveToPawn(attackTarget, range); } } - - return; } // Else, if the actor is muted and far from target, just "move to pawn" - else if (_actor.isMuted() && (dist_2 > ((range + 20) * (range + 20)))) + else if (_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) { // Temporary hack for preventing guards jumping off towers, // before replacing this with effective geodata checks and AI modification @@ -463,11 +456,9 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { moveToPawn(attackTarget, range); } - - return; } // Else, if this is close enough to attack - else if (dist_2 <= ((range + 20) * (range + 20))) + else if (dist2 <= ((range + 20) * (range + 20))) { // Force mobs to attak anybody if confused Creature hated = null; @@ -501,7 +492,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { final int castRange = sk.getCastRange(); - if (((castRange * castRange) >= dist_2) && (castRange <= 70) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) + if (((castRange * castRange) >= dist2) && (castRange <= 70) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) { @@ -534,11 +525,11 @@ public class SiegeGuardAI extends CreatureAI implements Runnable } } - WorldObject OldTarget = _actor.getTarget(); + WorldObject oldTarget = _actor.getTarget(); clientStopMoving(null); _accessor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -562,17 +553,14 @@ public class SiegeGuardAI extends CreatureAI implements Runnable */ private void thinkAttack() { - if (_attackTimeout < GameTimeController.getGameTicks()) + // Check if the actor is running + if ((_attackTimeout < GameTimeController.getGameTicks()) && _actor.isRunning()) { - // Check if the actor is running - if (_actor.isRunning()) - { - // Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others PlayerInstance - _actor.setWalking(); - - // Calculate a new attack timeout - _attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getGameTicks(); - } + // Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others PlayerInstance + _actor.setWalking(); + + // Calculate a new attack timeout + _attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getGameTicks(); } final Creature attackTarget = getAttackTarget(); @@ -634,9 +622,9 @@ public class SiegeGuardAI extends CreatureAI implements Runnable NpcInstance npc = (NpcInstance) creature; - String faction_id = ((NpcInstance) actor).getFactionId(); + String factionId = ((NpcInstance) actor).getFactionId(); - if (!faction_id.equalsIgnoreCase(npc.getFactionId())) + if (!factionId.equalsIgnoreCase(npc.getFactionId())) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java index eb8015d568..9d282bff17 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.actor.Summon; public class SummonAI extends CreatureAI { private boolean _thinking; // to prevent recursive thinking - private Summon summon; public SummonAI(AIAccessor accessor) { @@ -63,12 +62,13 @@ public class SummonAI extends CreatureAI private void thinkAttack() { - summon = (Summon) _actor; + Summon summon = (Summon) _actor; + WorldObject target = null; target = summon.getTarget(); // Like L2OFF if the target is dead the summon must go back to his owner - if ((target != null) && (summon != null) && ((Creature) target).isDead()) + if ((target != null) && ((Creature) target).isDead()) { summon.setFollowStatus(true); } @@ -86,7 +86,6 @@ public class SummonAI extends CreatureAI clientStopMoving(null); _accessor.doAttack(getAttackTarget()); - return; } private void thinkCast() @@ -99,7 +98,7 @@ public class SummonAI extends CreatureAI setCastTarget(null); } - final Skill skill = get_skill(); + final Skill skill = getSkill(); if (maybeMoveToPawn(target, _actor.getMagicalAttackRange(skill))) { return; @@ -109,7 +108,6 @@ public class SummonAI extends CreatureAI summon.setFollowStatus(false); setIntention(AI_INTENTION_IDLE); _accessor.doCast(skill); - return; } private void thinkPickUp() @@ -133,8 +131,6 @@ public class SummonAI extends CreatureAI setIntention(AI_INTENTION_IDLE); ((Summon.AIAccessor) _accessor).doPickupItem(target); - - return; } private void thinkInteract() @@ -157,8 +153,6 @@ public class SummonAI extends CreatureAI } setIntention(AI_INTENTION_IDLE); - - return; } @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java index ca8fadb125..f5e8ea4a9c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; */ public class CrestCache { - private static Logger LOGGER = Logger.getLogger(CrestCache.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CrestCache.class.getName()); private final Map
").replaceAll("<", "<").replaceAll(">", ">").replaceAll("\"", """)); + content = content.replace("%title%", letter.subject.replace("<", "<").replace(">", ">").replace("\"", """)); + content = content.replace("%mes%", letter.message.replace("\r\n", "
").replace("<", "<").replace(">", ">").replace("\"", """)); content = content.replace("%letterId%", letter.letterId + ""); separateAndSend(content, activeChar); } @@ -570,7 +570,7 @@ public class MailBBSManager extends BaseBBSManager } // Edit message. - message = message.replaceAll("\n", "
| ", t.getName(), " | ", dateFormat.format(new Date(t.getDate())), " |
| ", t.getName(), " | ", dateFormat.format(new Date(t.getDate())), " |