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

Fixed idle YeSagira guards.

Browse Source
This commit is contained in:
MobiusDev
2017-09-19 06:09:33 +00:00
parent d09e4d1fac
commit c74fcddc1b
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
*/ */
package ai.areas.TalkingIsland; package ai.areas.TalkingIsland;
import java.util.List;
import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
@@ -46,15 +48,15 @@ public final class YeSagiraGuards extends AbstractNpcAI
{ {
if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat()) if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
{ {
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster -> final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty())
{ {
if ((monster != null) && monster.isScriptValue(0)) // not retail - but looks better final L2MonsterInstance monster = nearbyMonsters.get(getRandom(nearbyMonsters.size()));
if ((monster != null) && !monster.isDead() && !monster.isInCombat())
{ {
monster.setScriptValue(1);
npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
return; // one target only
} }
}); }
} }
return super.onAdvEvent(event, npc, player); return super.onAdvEvent(event, npc, player);
} }

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

@@ -16,6 +16,8 @@
*/ */
package ai.areas.TalkingIsland; package ai.areas.TalkingIsland;
import java.util.List;
import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
@@ -46,15 +48,15 @@ public final class YeSagiraGuards extends AbstractNpcAI
{ {
if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat()) if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
{ {
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster -> final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty())
{ {
if ((monster != null) && monster.isScriptValue(0)) // not retail - but looks better final L2MonsterInstance monster = nearbyMonsters.get(getRandom(nearbyMonsters.size()));
if ((monster != null) && !monster.isDead() && !monster.isInCombat())
{ {
monster.setScriptValue(1);
npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
return; // one target only
} }
}); }
} }
return super.onAdvEvent(event, npc, player); return super.onAdvEvent(event, npc, player);
} }

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

@@ -16,6 +16,8 @@
*/ */
package ai.areas.TalkingIsland; package ai.areas.TalkingIsland;
import java.util.List;
import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
@@ -46,15 +48,15 @@ public final class YeSagiraGuards extends AbstractNpcAI
{ {
if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat()) if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead() && !npc.isInCombat())
{ {
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster -> final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty())
{ {
if ((monster != null) && monster.isScriptValue(0)) // not retail - but looks better final L2MonsterInstance monster = nearbyMonsters.get(getRandom(nearbyMonsters.size()));
if ((monster != null) && !monster.isDead() && !monster.isInCombat())
{ {
monster.setScriptValue(1);
npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
return; // one target only
} }
}); }
} }
return super.onAdvEvent(event, npc, player); return super.onAdvEvent(event, npc, player);
} }