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

Minor update for missing html commands.

Browse Source
This commit is contained in:
MobiusDev 2017-08-03 18:03:10 +00:00
parent a2a8b8f931
commit 5e836a200a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java vendored
View File

@ -156,10 +156,10 @@ public class AdminGeodata implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>(); final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects()) for (L2Object obj : L2World.getInstance().getVisibleObjects())
{ {
if (obj.isNpc() && !obj.isMonster()) if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
{ {
final L2Npc npc = (L2Npc) obj; final L2Npc npc = (L2Npc) obj;
if (!results.contains(npc.getId()) && (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")) 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()); results.add(npc.getId());
} }
@ -179,10 +179,10 @@ public class AdminGeodata implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>(); final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects()) for (L2Object obj : L2World.getInstance().getVisibleObjects())
{ {
if (obj.isNpc() && !obj.isMonster()) if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
{ {
final L2Npc npc = (L2Npc) obj; final L2Npc npc = (L2Npc) obj;
if (!results.contains(npc.getId()) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{ {
results.add(npc.getId()); results.add(npc.getId());
} }

8
L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java vendored
View File

@ -156,10 +156,10 @@ public class AdminGeodata implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>(); final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects()) for (L2Object obj : L2World.getInstance().getVisibleObjects())
{ {
if (obj.isNpc() && !obj.isMonster()) if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
{ {
final L2Npc npc = (L2Npc) obj; final L2Npc npc = (L2Npc) obj;
if (!results.contains(npc.getId()) && (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")) 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()); results.add(npc.getId());
} }
@ -179,10 +179,10 @@ public class AdminGeodata implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>(); final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects()) for (L2Object obj : L2World.getInstance().getVisibleObjects())
{ {
if (obj.isNpc() && !obj.isMonster()) if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
{ {
final L2Npc npc = (L2Npc) obj; final L2Npc npc = (L2Npc) obj;
if (!results.contains(npc.getId()) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{ {
results.add(npc.getId()); results.add(npc.getId());
} }

8
L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java vendored
View File

@ -156,10 +156,10 @@ public class AdminGeodata implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>(); final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects()) for (L2Object obj : L2World.getInstance().getVisibleObjects())
{ {
if (obj.isNpc() && !obj.isMonster()) if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
{ {
final L2Npc npc = (L2Npc) obj; final L2Npc npc = (L2Npc) obj;
if (!results.contains(npc.getId()) && (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")) 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()); results.add(npc.getId());
} }
@ -179,10 +179,10 @@ public class AdminGeodata implements IAdminCommandHandler
final List<Integer> results = new ArrayList<>(); final List<Integer> results = new ArrayList<>();
for (L2Object obj : L2World.getInstance().getVisibleObjects()) for (L2Object obj : L2World.getInstance().getVisibleObjects())
{ {
if (obj.isNpc() && !obj.isMonster()) if (obj.isNpc() && !obj.isMonster() && !results.contains(obj.getId()))
{ {
final L2Npc npc = (L2Npc) obj; final L2Npc npc = (L2Npc) obj;
if (!results.contains(npc.getId()) && npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0) == "data/html/npcdefault.htm"))
{ {
results.add(npc.getId()); results.add(npc.getId());
} }