From 43e04da970c375e9287d8a9709a585e6f889c1c0 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 11 Sep 2018 13:36:06 +0000 Subject: [PATCH] Removed onEvtThink method debug message. --- .../gameserver/ai/L2AttackableAI.java | 11 +++++----- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 20 ++++++++----------- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 20 ++++++++----------- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 20 ++++++++----------- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 20 ++++++++----------- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 20 ++++++++----------- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 20 ++++++++----------- .../gameserver/model/actor/L2Attackable.java | 2 +- 14 files changed, 61 insertions(+), 84 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 4acae2c632..1a4a42371a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1202,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index dd88803d34..cc9700f63e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -784,7 +784,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 238f2279b7..1a4a42371a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1169,13 +1168,8 @@ public class L2AttackableAI extends L2CharacterAI @Override protected void onEvtThink() { - // Check if the actor can't use skills - if (getActiveChar().isAllSkillsDisabled()) - { - return; - } - // Check if a thinking action isn't already in progress - if (_thinking) + // Check if the actor can't use skills and if a thinking action isn't already in progress + if (_thinking || getActiveChar().isAllSkillsDisabled()) { return; } @@ -1207,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 8a3e1e0d59..89bce967d5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -780,7 +780,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 238f2279b7..1a4a42371a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1169,13 +1168,8 @@ public class L2AttackableAI extends L2CharacterAI @Override protected void onEvtThink() { - // Check if the actor can't use skills - if (getActiveChar().isAllSkillsDisabled()) - { - return; - } - // Check if a thinking action isn't already in progress - if (_thinking) + // Check if the actor can't use skills and if a thinking action isn't already in progress + if (_thinking || getActiveChar().isAllSkillsDisabled()) { return; } @@ -1207,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 8a3e1e0d59..89bce967d5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -780,7 +780,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 238f2279b7..1a4a42371a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1169,13 +1168,8 @@ public class L2AttackableAI extends L2CharacterAI @Override protected void onEvtThink() { - // Check if the actor can't use skills - if (getActiveChar().isAllSkillsDisabled()) - { - return; - } - // Check if a thinking action isn't already in progress - if (_thinking) + // Check if the actor can't use skills and if a thinking action isn't already in progress + if (_thinking || getActiveChar().isAllSkillsDisabled()) { return; } @@ -1207,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 8a3e1e0d59..89bce967d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -780,7 +780,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 238f2279b7..1a4a42371a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1169,13 +1168,8 @@ public class L2AttackableAI extends L2CharacterAI @Override protected void onEvtThink() { - // Check if the actor can't use skills - if (getActiveChar().isAllSkillsDisabled()) - { - return; - } - // Check if a thinking action isn't already in progress - if (_thinking) + // Check if the actor can't use skills and if a thinking action isn't already in progress + if (_thinking || getActiveChar().isAllSkillsDisabled()) { return; } @@ -1207,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 5d09a8b440..bb350672a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -780,7 +780,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 238f2279b7..1a4a42371a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1169,13 +1168,8 @@ public class L2AttackableAI extends L2CharacterAI @Override protected void onEvtThink() { - // Check if the actor can't use skills - if (getActiveChar().isAllSkillsDisabled()) - { - return; - } - // Check if a thinking action isn't already in progress - if (_thinking) + // Check if the actor can't use skills and if a thinking action isn't already in progress + if (_thinking || getActiveChar().isAllSkillsDisabled()) { return; } @@ -1207,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 5d09a8b440..bb350672a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -780,7 +780,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 238f2279b7..1a4a42371a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -1169,13 +1168,8 @@ public class L2AttackableAI extends L2CharacterAI @Override protected void onEvtThink() { - // Check if the actor can't use skills - if (getActiveChar().isAllSkillsDisabled()) - { - return; - } - // Check if a thinking action isn't already in progress - if (_thinking) + // Check if the actor can't use skills and if a thinking action isn't already in progress + if (_thinking || getActiveChar().isAllSkillsDisabled()) { return; } @@ -1207,11 +1201,13 @@ public class L2AttackableAI extends L2CharacterAI } catch (Exception e) { - LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + } + finally + { + // Stop thinking action + _thinking = false; } - - // Finish thinking action - _thinking = false; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 5d09a8b440..bb350672a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -780,7 +780,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - LOGGER.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; }