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

Improved missing htmls command.

Browse Source
This commit is contained in:
MobiusDev
2018-09-06 21:21:31 +00:00
parent 4639e7281d
commit cd1b1b02f3
7 changed files with 84 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());

23
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());

23
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());

23
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());

23
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());

23
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());

23
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -21,11 +21,12 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ObservationInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.util.BuilderUtil;
@@ -60,13 +61,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if ((npc.getLocation().getX() > topLeftX) && (npc.getLocation().getX() < bottomRightX) && (npc.getLocation().getY() > topLeftY) && (npc.getLocation().getY() < bottomRightY) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());
@@ -87,13 +88,13 @@ public class AdminMissingHtmls implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects())
{
if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
if (obj.isNpc() //
&& !obj.isMonster() //
&& !(obj instanceof L2ObservationInstance) //
&& !(obj instanceof L2ArtefactInstance) //
&& !results.contains(obj.getId()))
{
final L2Npc npc = (L2Npc) obj;
if (npc.getInstanceType() == InstanceType.L2ObservationInstance)
{
continue;
}
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{
results.add(npc.getId());