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

Changed L2Character setIsRunning visibility to private.

Browse Source
This commit is contained in:
MobiusDev
2017-11-26 14:31:26 +00:00
parent e016154fef
commit 67c073b42e
203 changed files with 637 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java vendored
View File

@@ -358,7 +358,7 @@ public final class Baium extends AbstractNpcAI
{
mob.clearAggroList();
}
mob.setIsRunning(true);
mob.setRunning();
mob.addDamageHate(_baium, 0, 999);
mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _baium);
}

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java vendored
View File

@@ -186,7 +186,7 @@ public final class SummonNpc extends AbstractEffect
{
npc.scheduleDespawn(_despawnDelay);
}
npc.setIsRunning(false); // TODO: Fix broadcast info.
npc.setWalking(); // TODO: Fix broadcast info.
}
}
}

11
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/RunWalk.java vendored
View File

@@ -22,13 +22,20 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
/**
* Run/Walk player action handler.
* @author UnAfraid
* @author Mobius
*/
public final class RunWalk implements IPlayerActionHandler
{
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
activeChar.setIsRunning(!activeChar.isRunning());
if (activeChar.isRunning())
{
activeChar.setWalking();
}
else
{
activeChar.setRunning();
}
}
}

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java vendored
View File

@@ -683,7 +683,7 @@ public final class Q00227_TestOfTheReformer extends Quest
case OL_MAHUM_BETRAYER:
{
startQuestTimer("DESPAWN", 5000, npc, null, true);
npc.setIsRunning(true);
npc.setRunning();
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MOVE_TO);
npc.getVariables().set("SPAWNED", 0);
break;

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

@@ -676,7 +676,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
// Set the AI Intention to AI_INTENTION_ACTIVE
setIntention(AI_INTENTION_ACTIVE);
npc.setWalking();
if (!_actor.isFakePlayer())
{
npc.setWalking();
}
return;
}

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java
View File

@@ -825,7 +825,7 @@ public class L2CharacterAI extends AbstractAI
// Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast)
clientNotifyDead();
if (!_actor.isPlayable())
if (!_actor.isPlayable() && !_actor.isFakePlayer())
{
_actor.setWalking();
}

18
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
View File

@@ -299,7 +299,14 @@ public final class WalkingManager implements IGameXmlReader
}
npc.sendDebugMessage("Starting to move at route '" + routeName + "'");
npc.setIsRunning(node.runToLocation());
if (node.runToLocation())
{
npc.setRunning();
}
else
{
npc.setWalking();
}
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node);
walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight
@@ -332,7 +339,14 @@ public final class WalkingManager implements IGameXmlReader
walk.setBlocked(true);
final L2NpcWalkerNode node = walk.getCurrentNode();
npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId());
npc.setIsRunning(node.runToLocation());
if (node.runToLocation())
{
npc.setRunning();
}
else
{
npc.setWalking();
}
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node);
walk.setBlocked(false);
walk.setStoppedByAttack(false);

21
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@@ -768,7 +768,10 @@ public class L2Attackable extends L2Npc
((L2AttackableAI) getAI()).setGlobalAggro(-25);
clearAggroList();
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
setWalking();
if (!isFakePlayer())
{
setWalking();
}
}
return;
}
@@ -786,7 +789,10 @@ public class L2Attackable extends L2Npc
((L2AttackableAI) getAI()).setGlobalAggro(-25);
clearAggroList();
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
setWalking();
if (!isFakePlayer())
{
setWalking();
}
}
}
@@ -1407,14 +1413,16 @@ public class L2Attackable extends L2Npc
setScriptValue(0); // remove pvp flag
setRunning(); // don't walk
}
else
{
setWalking();
}
// Clear mod Seeded stat
_seeded = false;
_seed = null;
_seederObjId = 0;
setWalking();
// check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion())
// {
@@ -1745,7 +1753,10 @@ public class L2Attackable extends L2Npc
{
((L2AttackableAI) getAI()).setGlobalAggro(-25);
}
setWalking();
if (!isFakePlayer())
{
setWalking();
}
clearAggroList();
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -2311,7 +2311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return _isRunning;
}
public final void setIsRunning(boolean value)
private final void setIsRunning(boolean value)
{
if (_isRunning == value)
{
@@ -2359,10 +2359,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
/** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */
public final void setRunning()
{
if (!isRunning())
{
setIsRunning(true);
}
setIsRunning(true);
}
public final boolean hasBlockActions()

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -3199,7 +3199,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
{
((L2Attackable) npc).addDamageHate(target, 0, desire);
}
npc.setIsRunning(true);
npc.setRunning();
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
@@ -3210,7 +3210,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
*/
protected void addAttackDesire(L2Npc npc, L2Character target)
{
npc.setIsRunning(true);
npc.setRunning();
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}