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

Fixed CPU consumption issue after revision 6064.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-10-19 11:04:02 +00:00
parent cb8b39b7d4
commit 0ce9c48d39
21 changed files with 83 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1451,9 +1451,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1477,14 +1474,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1397,9 +1397,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1423,14 +1420,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1397,9 +1397,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1423,14 +1420,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1397,9 +1397,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1423,14 +1420,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

3
L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@@ -2148,10 +2148,9 @@
<affectObject>NOT_FRIEND</affectObject> <affectObject>NOT_FRIEND</affectObject>
<isDebuff>true</isDebuff> <isDebuff>true</isDebuff>
<effects> <effects>
<effect name="TargetMe" />
<effect name="GetAgro" /> <effect name="GetAgro" />
<effect name="AddHate"> <effect name="AddHate">
<power>1000000</power> <power>500</power>
</effect> </effect>
<effect name="HateAttack"> <effect name="HateAttack">
<amount>500</amount> <amount>500</amount>

16
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1386,9 +1386,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1412,14 +1409,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@@ -2148,10 +2148,9 @@
<affectObject>NOT_FRIEND</affectObject> <affectObject>NOT_FRIEND</affectObject>
<isDebuff>true</isDebuff> <isDebuff>true</isDebuff>
<effects> <effects>
<effect name="TargetMe" />
<effect name="GetAgro" /> <effect name="GetAgro" />
<effect name="AddHate"> <effect name="AddHate">
<power>1000000</power> <power>500</power>
</effect> </effect>
<effect name="HateAttack"> <effect name="HateAttack">
<amount>500</amount> <amount>500</amount>

16
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1386,9 +1386,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1412,14 +1409,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

3
L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@@ -2237,10 +2237,9 @@
<affectObject>NOT_FRIEND</affectObject> <affectObject>NOT_FRIEND</affectObject>
<isDebuff>true</isDebuff> <isDebuff>true</isDebuff>
<effects> <effects>
<effect name="TargetMe" />
<effect name="GetAgro" /> <effect name="GetAgro" />
<effect name="AddHate"> <effect name="AddHate">
<power>1000000</power> <power>500</power>
</effect> </effect>
<effect name="HateAttack"> <effect name="HateAttack">
<amount>500</amount> <amount>500</amount>

16
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1386,9 +1386,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1412,14 +1409,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

3
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@@ -2237,10 +2237,9 @@
<affectObject>NOT_FRIEND</affectObject> <affectObject>NOT_FRIEND</affectObject>
<isDebuff>true</isDebuff> <isDebuff>true</isDebuff>
<effects> <effects>
<effect name="TargetMe" />
<effect name="GetAgro" /> <effect name="GetAgro" />
<effect name="AddHate"> <effect name="AddHate">
<power>1000000</power> <power>500</power>
</effect> </effect>
<effect name="HateAttack"> <effect name="HateAttack">
<amount>500</amount> <amount>500</amount>

16
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1394,9 +1394,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1420,14 +1417,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -3071,9 +3071,6 @@ public class Attackable extends NpcInstance
// Clear all aggro char from list // Clear all aggro char from list
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester Rewrard List // Clear Harvester Rewrard List
_harvestItems = null; _harvestItems = null;
@@ -3085,8 +3082,8 @@ public class Attackable extends NpcInstance
setWalking(); setWalking();
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
{ {
if (this instanceof SiegeGuardInstance) if (this instanceof SiegeGuardInstance)
{ {

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1405,9 +1405,6 @@ public class Attackable extends Npc
// Clear all aggro char from list // Clear all aggro char from list
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
@@ -1436,8 +1433,8 @@ public class Attackable extends Npc
setWalking(); setWalking();
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
if (!isInActiveRegion() && hasAI()) if (hasAI() && !isInActiveRegion())
{ {
getAI().stopAITask(); getAI().stopAITask();
} }

16
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1387,9 +1387,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1413,14 +1410,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1387,9 +1387,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1413,14 +1410,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1387,9 +1387,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1413,14 +1410,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1409,9 +1409,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1435,14 +1432,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1409,9 +1409,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1435,14 +1432,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1409,9 +1409,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1435,14 +1432,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override

16
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -1387,9 +1387,6 @@ public class Attackable extends Npc
// Clear all aggro list and overhit // Clear all aggro list and overhit
clearAggroList(); clearAggroList();
// Set the intention of the Attackable to AI_INTENTION_ACTIVE
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
// Clear Harvester reward // Clear Harvester reward
_harvestItem.set(null); _harvestItem.set(null);
_sweepItems.set(null); _sweepItems.set(null);
@@ -1413,14 +1410,11 @@ public class Attackable extends Npc
_seed = null; _seed = null;
_seederObjId = 0; _seederObjId = 0;
// check the region where this mob is, do not activate the AI if region is inactive. // Check the region where this mob is, do not activate the AI if region is inactive.
// if (!isInActiveRegion()) if (hasAI() && !isInActiveRegion())
// { {
// if (hasAI()) getAI().stopAITask();
// { }
// getAI().stopAITask();
// }
// }
} }
@Override @Override