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

Sync with L2jServer HighFive Jul 30th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-07-30 20:47:48 +00:00
parent b3531f47c1
commit 6185db8d5f
27 changed files with 252 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java
View File

@ -54,6 +54,14 @@ public class EnchantItemHPBonusData implements IXmlReader
load();
}
@Override
public void load()
{
_armorHPBonuses.clear();
parseDatapackFile("stats/enchantHPBonus.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _armorHPBonuses.size() + " Enchant HP Bonuses.");
}
@Override
public void parseDocument(Document doc)
{
@ -111,14 +119,6 @@ public class EnchantItemHPBonusData implements IXmlReader
}
}
@Override
public void load()
{
_armorHPBonuses.clear();
parseDatapackFile("stats/enchantHPBonus.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _armorHPBonuses.size() + " Enchant HP Bonuses.");
}
/**
* Gets the HP bonus.
* @param item the item

1
trunk/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java
View File

@ -29,6 +29,7 @@ import org.w3c.dom.Node;
import com.l2jserver.util.data.xml.IXmlReader;
/**
* Karma data.
* @author UnAfraid
*/
public class KarmaData implements IXmlReader

9
trunk/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java
View File

@ -111,7 +111,6 @@ public final class MultisellData implements IXmlReader
}
catch (NumberFormatException e)
{
try
{
list.setUseRate(Config.class.getField(att.getNodeValue()).getDouble(Config.class));
@ -238,13 +237,13 @@ public final class MultisellData implements IXmlReader
ListContainer template = _entries.get(listId);
if (template == null)
{
LOGGER.warning(getClass().getSimpleName() + ": can't find list id: " + listId + " requested by player: " + player.getName() + ", npcId:" + (npc != null ? npc.getId() : 0));
LOGGER.warning(getClass().getSimpleName() + ": Cannot find list ID: " + listId + " requested by player: " + player.getName() + ", NPC ID:" + (npc != null ? npc.getId() : 0));
return;
}
if (!template.isNpcAllowed(-1) && (((npc != null) && !template.isNpcAllowed(npc.getId())) || ((npc == null) && template.isNpcOnly())))
{
LOGGER.warning(getClass().getSimpleName() + ": player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!");
LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!");
return;
}
@ -386,14 +385,14 @@ public final class MultisellData implements IXmlReader
{
if (!verifyIngredient(ing))
{
LOGGER.warning(getClass().getSimpleName() + ": can't find ingredient with itemId: " + ing.getItemId() + " in list: " + list.getListId());
LOGGER.warning(getClass().getSimpleName() + ": Cannot find ingredient with item ID: " + ing.getItemId() + " in list: " + list.getListId());
}
}
for (Ingredient ing : ent.getProducts())
{
if (!verifyIngredient(ing))
{
LOGGER.warning(getClass().getSimpleName() + ": can't find product with itemId: " + ing.getItemId() + " in list: " + list.getListId());
LOGGER.warning(getClass().getSimpleName() + ": Cannot find product with item ID: " + ing.getItemId() + " in list: " + list.getListId());
}
}
}

1
trunk/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java
View File

@ -35,6 +35,7 @@ import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
import com.l2jserver.util.data.xml.IXmlReader;
/**
* Item Option data.
* @author UnAfraid
*/
public class OptionData implements IXmlReader

1
trunk/java/com/l2jserver/gameserver/data/xml/impl/SecondaryAuthData.java
View File

@ -29,6 +29,7 @@ import org.w3c.dom.Node;
import com.l2jserver.util.data.xml.IXmlReader;
/**
* Secondary Auth data.
* @author NosBit
*/
public class SecondaryAuthData implements IXmlReader

1
trunk/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java
View File

@ -33,6 +33,7 @@ import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.data.xml.IXmlReader;
/**
* Siege Schedule data.
* @author UnAfraid
*/
public class SiegeScheduleData implements IXmlReader

2
trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java
View File

@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.util.data.xml.IXmlReader;
/**
* Holds all skill learn data for all npcs.
* Holds all skill learn data for all NPCs.
* @author xban1x
*/
public final class SkillLearnData implements IXmlReader

1
trunk/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java
View File

@ -38,6 +38,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
import com.l2jserver.util.data.xml.IXmlReader;
/**
* Transformation data.
* @author UnAfraid
*/
public final class TransformData implements IXmlReader