diff --git a/aCis/data/xml/merchantSays.xml b/aCis/data/xml/merchantSays.xml index 144a7f5..3bc5c8a 100644 --- a/aCis/data/xml/merchantSays.xml +++ b/aCis/data/xml/merchantSays.xml @@ -1,26 +1,4 @@ - - + \ No newline at end of file diff --git a/aCis/java/net/sf/l2j/gameserver/data/xml/MerchantSayData.java b/aCis/java/net/sf/l2j/gameserver/data/xml/MerchantSayData.java index 8d089c8..b8c41b0 100644 --- a/aCis/java/net/sf/l2j/gameserver/data/xml/MerchantSayData.java +++ b/aCis/java/net/sf/l2j/gameserver/data/xml/MerchantSayData.java @@ -6,7 +6,6 @@ import net.sf.l2j.commons.data.xml.IXmlReader; -import net.sf.l2j.gameserver.enums.SayType; import net.sf.l2j.gameserver.model.MerchantSay; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -46,10 +45,9 @@ final int npcId = Integer.valueOf(attrs.getNamedItem("npcId").getNodeValue()); final String text = attrs.getNamedItem("text").getNodeValue(); - final SayType say = Enum.valueOf(SayType.class, attrs.getNamedItem("sayType").getNodeValue()); final boolean effect = Boolean.valueOf(attrs.getNamedItem("effect").getNodeValue()); - _says.put(npcId, new MerchantSay(npcId, text, say, effect)); + _says.put(npcId, new MerchantSay(text, effect)); })); } diff --git a/aCis/java/net/sf/l2j/gameserver/model/MerchantSay.java b/aCis/java/net/sf/l2j/gameserver/model/MerchantSay.java index 256d7af..18d027d 100644 --- a/aCis/java/net/sf/l2j/gameserver/model/MerchantSay.java +++ b/aCis/java/net/sf/l2j/gameserver/model/MerchantSay.java @@ -1,41 +1,25 @@ package net.sf.l2j.gameserver.model; -import net.sf.l2j.gameserver.enums.SayType; - /** * @author willi * */ public class MerchantSay { - private final int _npcId; private final String _text; - private final SayType _type; private final boolean _effect; - public MerchantSay(int npcId, String text, SayType type, boolean effect) + public MerchantSay(String text, boolean effect) { - _npcId = npcId; _text = text; - _type = type; _effect = effect; } - public int getNpcId() - { - return _npcId; - } - public String getText() { return _text; } - public SayType getType() - { - return _type; - } - public boolean isEffects() { return _effect; diff --git a/aCis/java/net/sf/l2j/gameserver/model/actor/instance/Merchant.java b/aCis/java/net/sf/l2j/gameserver/model/actor/instance/Merchant.java index 070ef2e..d8f1b28 100644 --- a/aCis/java/net/sf/l2j/gameserver/model/actor/instance/Merchant.java +++ b/aCis/java/net/sf/l2j/gameserver/model/actor/instance/Merchant.java @@ -9,6 +9,7 @@ import net.sf.l2j.gameserver.data.xml.MerchantSayData; import net.sf.l2j.gameserver.data.xml.MultisellData; import net.sf.l2j.gameserver.enums.FloodProtector; +import net.sf.l2j.gameserver.enums.SayType; import net.sf.l2j.gameserver.model.MerchantSay; import net.sf.l2j.gameserver.model.actor.Player; import net.sf.l2j.gameserver.model.actor.template.NpcTemplate; @@ -38,13 +39,13 @@ public String getHtmlPath(int npcId, int val) { final MerchantSay says = MerchantSayData.getInstance().getNpc(getNpcId()); - if (says == null) - return ""; - - broadcastPacket(new CreatureSay(getObjectId(), says.getType(), getName(), says.getText())); - - if (says.isEffects()) - broadcastPacket(new MagicSkillUse(this, this, 2024, 1, 5, 0)); + if (says != null) + { + broadcastPacket(new CreatureSay(getObjectId(), SayType.TELL, getName(), says.getText())); + + if (says.isEffects()) + broadcastPacket(new MagicSkillUse(this, this, 2024, 1, 5, 0)); + } String filename = "";