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

Sync with L2jServer HighFive Mar 12th 2015.

Browse Source
This commit is contained in:
mobius
2015-03-12 06:24:54 +00:00
parent 19718aa9f4
commit 9b28306cf1
8 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,7 +621,7 @@ public interface IXmlReader
* Simple XML error handler.
* @author Zoey76
*/
class XMLErrorHandler implements ErrorHandler
static class XMLErrorHandler implements ErrorHandler
{
@Override
public void warning(SAXParseException e) throws SAXParseException

4
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@ -2535,10 +2535,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
stopAllEffectsExceptThoseThatLastThroughDeath();
if (isPlayer() && (getActingPlayer().getAgathionId() != 0))
{
getActingPlayer().setAgathionId(0);
}
calculateRewards(killer);
// Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform

2
trunk/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@ -410,7 +410,7 @@ public abstract class AbstractOlympiadGame
{
return;
}
player.setIsPendingRevive(false);
player.setInstanceId(0);
player.teleToLocation(loc);
player.unsetLastLocation();

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
View File

@ -53,8 +53,8 @@ public class ExOlympiadSpelledInfo extends L2GameServerPacket
{
if ((info != null) && info.isInUse())
{
writeD(info.getSkill().getId());
writeH(info.getSkill().getLevel());
writeD(info.getSkill().getDisplayId());
writeH(info.getSkill().getDisplayLevel());
writeD(0x00);
writeH(info.getTime());
}

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java
View File

@ -50,8 +50,8 @@ public class PartySpelled extends L2GameServerPacket
{
if ((info != null) && info.isInUse())
{
writeD(info.getSkill().getId());
writeH(info.getSkill().getLevel());
writeD(info.getSkill().getDisplayId());
writeH(info.getSkill().getDisplayLevel());
writeD(0x00);
writeH(info.getTime());
}