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

Exclude FlyTerrainObjectInstance from html search commands.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-08-04 11:47:22 +00:00
parent f3cf4963ff
commit b7b714ebd8
12 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

6
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

6
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

6
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

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

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminMissingHtmls.java vendored
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance; import org.l2jmobius.gameserver.model.actor.instance.ArtefactInstance;
import org.l2jmobius.gameserver.model.actor.instance.FlyTerrainObjectInstance;
import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance; import org.l2jmobius.gameserver.model.actor.instance.ObservationInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
@@ -66,6 +67,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -93,6 +95,7 @@ public class AdminMissingHtmls implements IAdminCommandHandler
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance) // && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance) //
&& !results.contains(obj.getId())) && !results.contains(obj.getId()))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
@@ -117,7 +120,8 @@ public class AdminMissingHtmls implements IAdminCommandHandler
if (obj.isNpc() // if (obj.isNpc() //
&& !obj.isMonster() // && !obj.isMonster() //
&& !(obj instanceof ObservationInstance) // && !(obj instanceof ObservationInstance) //
&& !(obj instanceof ArtefactInstance)) && !(obj instanceof ArtefactInstance) //
&& !(obj instanceof FlyTerrainObjectInstance))
{ {
final Npc npc = (Npc) obj; final Npc npc = (Npc) obj;
if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm")) if (npc.isTalkable() && !npc.hasListener(EventType.ON_NPC_FIRST_TALK) && (npc.getHtmlPath(npc.getId(), 0, null) == "data/html/npcdefault.htm"))