lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix YeSagiraGuards onEvtThink issue.

Browse Source
This commit is contained in:
MobiusDev 2017-09-19 05:33:25 +00:00
parent 850a989b49
commit 826ad542f1
7 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@ -48,7 +48,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
{
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster ->
{
if (monster.isScriptValue(0)) // not retail - but looks better
if ((monster != null) && monster.isScriptValue(0)) // not retail - but looks better
{
monster.setScriptValue(1);
npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -1079,8 +1079,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
@Override
protected void onEvtThink()
{
// Check if the actor can't use skills and if a thinking action isn't already in progress
if (_thinking || getActiveChar().isAllSkillsDisabled())
// Check if the actor can't use skills
if (getActiveChar().isAllSkillsDisabled())
{
return;
}
// Check if a thinking action isn't already in progress
if (_thinking)
{
return;
}
@ -1112,13 +1117,11 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, this + " - onEvtThink() failed", e);
}
finally
{
// Stop thinking action
_thinking = false;
LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e);
}
// Finish thinking action
_thinking = false;
}
/**

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@ -48,7 +48,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
{
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster ->
{
if (monster.isScriptValue(0)) // not retail - but looks better
if ((monster != null) && monster.isScriptValue(0)) // not retail - but looks better
{
monster.setScriptValue(1);
npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack

19
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -1079,8 +1079,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
@Override
protected void onEvtThink()
{
// Check if the actor can't use skills and if a thinking action isn't already in progress
if (_thinking || getActiveChar().isAllSkillsDisabled())
// Check if the actor can't use skills
if (getActiveChar().isAllSkillsDisabled())
{
return;
}
// Check if a thinking action isn't already in progress
if (_thinking)
{
return;
}
@ -1112,13 +1117,11 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, this + " - onEvtThink() failed", e);
}
finally
{
// Stop thinking action
_thinking = false;
LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e);
}
// Finish thinking action
_thinking = false;
}
/**

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@ -48,7 +48,7 @@ public final class YeSagiraGuards extends AbstractNpcAI
{
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster ->
{
if (monster.isScriptValue(0)) // not retail - but looks better
if ((monster != null) && monster.isScriptValue(0)) // not retail - but looks better
{
monster.setScriptValue(1);
npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -1079,8 +1079,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
@Override
protected void onEvtThink()
{
// Check if the actor can't use skills and if a thinking action isn't already in progress
if (_thinking || getActiveChar().isAllSkillsDisabled())
// Check if the actor can't use skills
if (getActiveChar().isAllSkillsDisabled())
{
return;
}
// Check if a thinking action isn't already in progress
if (_thinking)
{
return;
}
@ -1112,13 +1117,11 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, this + " - onEvtThink() failed", e);
}
finally
{
// Stop thinking action
_thinking = false;
LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e);
}
// Finish thinking action
_thinking = false;
}
/**

19
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -1079,8 +1079,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
@Override
protected void onEvtThink()
{
// Check if the actor can't use skills and if a thinking action isn't already in progress
if (_thinking || getActiveChar().isAllSkillsDisabled())
// Check if the actor can't use skills
if (getActiveChar().isAllSkillsDisabled())
{
return;
}
// Check if a thinking action isn't already in progress
if (_thinking)
{
return;
}
@ -1112,13 +1117,11 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, this + " - onEvtThink() failed", e);
}
finally
{
// Stop thinking action
_thinking = false;
LOGGER.log(Level.WARNING, this + " - " + getIntention().toString() + " - onEvtThink() failed", e);
}
// Finish thinking action
_thinking = false;
}
/**