diff --git a/L2J_DataPack_BETA/dist/game/data/Routes.xml b/L2J_DataPack_BETA/dist/game/data/Routes.xml index 88ba203c72a7c1dac04e2d317ba4951efb9dd523..2217a99ecd7a1f4a6fe3f8d5b67aa5dacbb0ced5 100644 --- a/L2J_DataPack_BETA/dist/game/data/Routes.xml +++ b/L2J_DataPack_BETA/dist/game/data/Routes.xml @@ -7,7 +7,6 @@ <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/Routes.xsd"> <!-- Just test route - Giran town square --> <route id="1" repeat="true" repeatStyle="cycle"> - <stat name="debug" val="false" /> <point string="" X="80863" Y="148339" Z="-3469" delay="0" run="true" /> <point string="" X="80904" Y="147653" Z="-3469" delay="0" run="true" /> <point string="" X="83205" Y="147646" Z="-3469" delay="0" run="true" /> diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 8c25b92a4a8906504df6410a0f7b92cb5b2057df..d2303a71202f70628be01cbfe6dabd35eb7987e2 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -26,7 +26,7 @@ import com.l2jserver.gameserver.datatables.DoorTable; import com.l2jserver.gameserver.datatables.ItemTable; import com.l2jserver.gameserver.datatables.MultiSell; import com.l2jserver.gameserver.datatables.NpcTable; -import com.l2jserver.gameserver.datatables.NpcWalkerRoutesTable; +import com.l2jserver.gameserver.datatables.NpcWalkerRoutesData; import com.l2jserver.gameserver.datatables.SkillTable; import com.l2jserver.gameserver.datatables.SpawnTable; import com.l2jserver.gameserver.datatables.TeleportLocationTable; @@ -287,7 +287,7 @@ public class AdminAdmin implements IAdminCommandHandler } else if (type.startsWith("npcwalkers")) { - NpcWalkerRoutesTable.getInstance().load(); + NpcWalkerRoutesData.getInstance().load(); activeChar.sendMessage("NPC Walker Routes have been reloaded"); } else if (type.startsWith("access")) diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index febc24d1ecf1c6ffd984e933fbddcaac8926153d..149bede1752b7004157f5b6f9e45bdbffcb0072c 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -14,7 +14,7 @@ */ package handlers.itemhandlers; -import com.l2jserver.gameserver.RecipeController; +import com.l2jserver.gameserver.datatables.RecipeData; import com.l2jserver.gameserver.handler.IItemHandler; import com.l2jserver.gameserver.model.L2RecipeList; import com.l2jserver.gameserver.model.actor.L2Playable; @@ -37,14 +37,13 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) { activeChar.sendPacket(SystemMessageId.CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING); return false; } - final L2RecipeList rp = RecipeController.getInstance().getRecipeByItemId(item.getItemId()); + final L2RecipeList rp = RecipeData.getInstance().getRecipeByItemId(item.getItemId()); if (rp == null) { return false; diff --git a/L2J_DataPack_BETA/dist/game/data/xsd/Routes.xsd b/L2J_DataPack_BETA/dist/game/data/xsd/Routes.xsd index acc2832770f1a88d03d70c1546dc8c20d4d44525..f7d0f86885354393f36560771840eb342c1e4038 100644 --- a/L2J_DataPack_BETA/dist/game/data/xsd/Routes.xsd +++ b/L2J_DataPack_BETA/dist/game/data/xsd/Routes.xsd @@ -6,18 +6,6 @@ <xs:element name="route" minOccurs="1" maxOccurs="unbounded"> <xs:complexType> <xs:sequence minOccurs="1" maxOccurs="1"> - <xs:element name="stat" minOccurs="0" maxOccurs="unbounded"> - <xs:complexType> - <xs:attribute name="name" use="required"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="debug" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="val" type="xs:token" use="required" /> - </xs:complexType> - </xs:element> <xs:element name="point" minOccurs="1" maxOccurs="unbounded"> <xs:complexType> <xs:attribute name="string" type="xs:normalizedString" use="required" />