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

Inherit multisell template NPC ids.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-09-13 17:17:40 +00:00
parent d21691842e
commit fea534e58e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -43,7 +43,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo;
import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.util.Util;
public class MultisellData implements IXmlReader public class MultisellData implements IXmlReader
{ {
@ -140,8 +139,6 @@ public class MultisellData implements IXmlReader
for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling()) for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
{ {
if ("npc".equalsIgnoreCase(b.getNodeName())) if ("npc".equalsIgnoreCase(b.getNodeName()))
{
if (Util.isDigit(b.getTextContent()))
{ {
list.allowNpc(Integer.parseInt(b.getTextContent())); list.allowNpc(Integer.parseInt(b.getTextContent()));
} }
@ -150,7 +147,6 @@ public class MultisellData implements IXmlReader
} }
} }
} }
}
_entries.put(id, list); _entries.put(id, list);
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java
View File

@ -93,6 +93,8 @@ public class PreparedListContainer extends ListContainer
_entries.add(new PreparedEntry(ent, null, getApplyTaxes(), false, taxRate)); _entries.add(new PreparedEntry(ent, null, getApplyTaxes(), false, taxRate));
} }
} }
_npcsAllowed = template._npcsAllowed;
} }
public boolean checkNpcObjectId(int npcObjectId) public boolean checkNpcObjectId(int npcObjectId)