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

Sync with L2JServer Jan 12th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-13 09:50:20 +00:00
parent a868d961a3
commit 0a44ad683c
1158 changed files with 59729 additions and 58627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java
View File

@ -19,7 +19,6 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
/**
@ -55,7 +54,6 @@ public final class Appearing extends L2GameClientPacket
}
sendPacket(new UserInfo(activeChar));
sendPacket(new ExBrExtraUserInfo(activeChar));
}
@Override

24
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@ -117,7 +117,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
{
activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -126,7 +126,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
{
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -137,7 +137,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
activeChar.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -150,7 +150,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
activeChar.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
}
@ -163,7 +163,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
{
activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -174,7 +174,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
{
activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
break;
}
case SUCCESS:
@ -187,7 +187,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
item.setEnchantLevel(item.getEnchantLevel() + 1);
item.updateDatabase();
}
activeChar.sendPacket(new EnchantResult(0, 0, 0, item.getEnchantLevel()));
activeChar.sendPacket(new EnchantResult(EnchantResult.SUCCESS, item));
if (Config.LOG_ITEM_ENCHANTS)
{
@ -239,7 +239,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
{
// safe enchant - remain old value
activeChar.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_SKILL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
activeChar.sendPacket(new EnchantResult(5, 0, 0, item.getEnchantLevel()));
activeChar.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
if (Config.LOG_ITEM_ENCHANTS)
{
@ -291,7 +291,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
item.setEnchantLevel(0);
item.updateDatabase();
activeChar.sendPacket(new EnchantResult(3, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.BLESSED_FAIL, 0, 0));
if (Config.LOG_ITEM_ENCHANTS)
{
@ -323,7 +323,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
// unable to destroy item, cheater ?
Util.handleIllegalPlayerAction(activeChar, "Unable to delete item on enchant failure from player " + activeChar.getName() + ", possible cheater !", Config.DEFAULT_PUNISH);
activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
activeChar.sendPacket(new EnchantResult(2, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
if (Config.LOG_ITEM_ENCHANTS)
{
@ -363,11 +363,11 @@ public final class RequestEnchantItem extends L2GameClientPacket
if (crystalId == 0)
{
activeChar.sendPacket(new EnchantResult(4, 0, 0));
activeChar.sendPacket(new EnchantResult(EnchantResult.NO_CRYSTAL, 0, 0));
}
else
{
activeChar.sendPacket(new EnchantResult(1, crystalId, count));
activeChar.sendPacket(new EnchantResult(EnchantResult.FAIL, crystalId, count));
}
if (Config.LOG_ITEM_ENCHANTS)

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
@ -196,7 +195,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
}
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.sendSkillList();
final int afterEnchantSkillLevel = player.getSkillLevel(_skillId);
player.sendPacket(new ExEnchantSkillInfo(_skillId, afterEnchantSkillLevel));

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
View File

@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
@ -191,7 +190,6 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
}
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
if (levelPenalty == 0)
{

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
View File

@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
@ -196,7 +195,6 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
}
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.sendSkillList();
final int afterEnchantSkillLevel = player.getSkillLevel(_skillId);
player.sendPacket(new ExEnchantSkillInfo(_skillId, afterEnchantSkillLevel));

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
View File

@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
@ -174,7 +173,6 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
}
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
if (_skillLvl > 100)
{

4
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
View File

@ -52,13 +52,13 @@ public final class RequestExPledgeCrestLarge extends L2GameClientPacket
{
final byte[] fullChunk = new byte[14336];
System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i, 14336));
sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
}
else
{
final byte[] lastChunk = new byte[8320];
System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i, 8320));
sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
}
}
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
View File

@ -51,7 +51,7 @@ public class RequestExRemoveEnchantSupportItem extends L2GameClientPacket
if ((supportItem == null) || (supportItem.getCount() < 1))
{
activeChar.sendPacket(new ExRemoveEnchantSupportItemResult());
activeChar.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET);
}
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java
View File

@ -20,6 +20,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.network.L2GameClient;
import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
import com.l2jserver.gameserver.network.serverpackets.ExLoginVitalityEffectInfo;
/**
* (ch)
@ -39,6 +40,7 @@ public class RequestGotoLobby extends L2GameClientPacket
protected void runImpl()
{
L2GameClient client = getClient();
client.sendPacket(new ExLoginVitalityEffectInfo(client));
client.sendPacket(new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1));
}

3
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java
View File

@ -24,6 +24,7 @@ import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.CommonSkill;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -63,7 +64,7 @@ public final class RequestMagicSkillUse extends L2GameClientPacket
skill = activeChar.getCustomSkill(_magicId);
if (skill == null)
{
if (SkillTreesData.getInstance().isSubClassChangeSkill(_magicId, 1))
if ((_magicId == CommonSkill.HAIR_ACCESSORY_SET.getId()) || SkillTreesData.getInstance().isSubClassChangeSkill(_magicId, 1))
{
skill = SkillData.getInstance().getSkill(_magicId, 1);
}

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
View File

@ -80,9 +80,9 @@ public class RequestPledgeRecruitBoardAccess extends L2GameClientPacket
ClanEntryManager.getInstance().removeFromClanList(clan.getId());
break;
}
case 1: // update
case 1: // add
{
if (ClanEntryManager.getInstance().updateClanList(clan.getId(), pledgeRecruitInfo))
if (ClanEntryManager.getInstance().addToClanList(clan.getId(), pledgeRecruitInfo))
{
activeChar.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_ENTRY_APPLICATION_INFO_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
}
@ -94,9 +94,9 @@ public class RequestPledgeRecruitBoardAccess extends L2GameClientPacket
}
break;
}
case 2: // add
case 2: // update
{
if (ClanEntryManager.getInstance().addToClanList(clan.getId(), pledgeRecruitInfo))
if (ClanEntryManager.getInstance().updateClanList(clan.getId(), pledgeRecruitInfo))
{
activeChar.sendPacket(SystemMessageId.ENTRY_APPLICATION_COMPLETE_USE_ENTRY_APPLICATION_INFO_TO_CHECK_OR_CANCEL_YOUR_APPLICATION_APPLICATION_IS_AUTOMATICALLY_CANCELLED_AFTER_30_DAYS_IF_YOU_CANCEL_APPLICATION_YOU_CANNOT_APPLY_AGAIN_FOR_5_MINUTES);
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java
View File

@ -23,7 +23,6 @@ import java.util.Collection;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.SpawnItem;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@ -47,7 +46,6 @@ public class RequestRecordInfo extends L2GameClientPacket
}
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.sendPacket(new ExBrExtraUserInfo(activeChar));
Collection<L2Object> objs = activeChar.getKnownList().getKnownObjects().values();
for (L2Object object : objs)

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java
View File

@ -21,7 +21,6 @@ package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@ -99,7 +98,6 @@ public final class RequestVoteNew extends L2GameClientPacket
target.sendPacket(sm);
activeChar.sendPacket(new UserInfo(activeChar));
sendPacket(new ExBrExtraUserInfo(activeChar));
target.broadcastUserInfo();
activeChar.sendPacket(new ExVoteSystemInfo(activeChar));