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

L2World related rework.

Browse Source
This commit is contained in:
MobiusDev
2018-09-04 19:27:09 +00:00
parent 70c624ed4a
commit 484ec7823d
79 changed files with 1137 additions and 2145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ public final class HillsOfGold extends AbstractNpcAI
{
if ((npc != null) && !npc.isDead())
{
L2World.getInstance().forEachVisibleObject(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby ->
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby ->
{
if (npc.isInCombat())
{

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

@@ -344,7 +344,7 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
{
final Location teleLoc = TELEPORT_ZONES.get(zone.getId());
// Conditions for Quest 454
L2World.getInstance().forEachVisibleObject(character, L2Npc.class, 500, npc ->
L2World.getInstance().forEachVisibleObjectInRange(character, L2Npc.class, 500, npc ->
{
if ((npc.getId() == 32738) && (npc.getTarget() != null))
{

30
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

@@ -213,14 +213,40 @@ public class AdminSpawn implements IAdminCommandHandler
{
Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_NPC_SERVER_IS_NOT_OPERATING_AT_THIS_TIME));
DBSpawnManager.getInstance().cleanUp();
L2World.getInstance().deleteVisibleNpcSpawns();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if ((obj != null) && obj.isNpc())
{
final L2Npc target = (L2Npc) obj;
target.deleteMe();
final L2Spawn spawn = target.getSpawn();
if (spawn != null)
{
spawn.stopRespawn();
SpawnTable.getInstance().deleteSpawn(spawn, false);
}
}
}
AdminData.getInstance().broadcastMessageToGMs("NPC Unspawn completed!");
}
else if (command.startsWith("admin_respawnall") || command.startsWith("admin_spawn_reload"))
{
// make sure all spawns are deleted
DBSpawnManager.getInstance().cleanUp();
L2World.getInstance().deleteVisibleNpcSpawns();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if ((obj != null) && obj.isNpc())
{
final L2Npc target = (L2Npc) obj;
target.deleteMe();
final L2Spawn spawn = target.getSpawn();
if (spawn != null)
{
spawn.stopRespawn();
SpawnTable.getInstance().deleteSpawn(spawn, false);
}
}
}
// now respawn all
NpcData.getInstance().load();
DBSpawnManager.getInstance().load();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@@ -190,7 +190,7 @@ public class AdminTeleport implements IAdminCommandHandler
st.nextToken();
final int x = (int) Float.parseFloat(st.nextToken());
final int y = (int) Float.parseFloat(st.nextToken());
final int z = st.hasMoreTokens() ? ((int) Float.parseFloat(st.nextToken())) : GeoEngine.getInstance().getHeight(x, y, L2World.MAP_MAX_Z);
final int z = st.hasMoreTokens() ? ((int) Float.parseFloat(st.nextToken())) : GeoEngine.getInstance().getHeight(x, y, 10000);
activeChar.teleToLocation(x, y, z);
}