Updated Infinite Odyssey patch.
This commit is contained in:
MobiusDev
parent
3f08928fd0
commit
9c1bf1a059
@ -2,7 +2,7 @@
|
||||
#P L2J_Mobius
|
||||
Index: dist/db_installer/sql/game/character_skills.sql
|
||||
===================================================================
|
||||
--- dist/db_installer/sql/game/character_skills.sql (revision 834)
|
||||
--- dist/db_installer/sql/game/character_skills.sql (revision 848)
|
||||
+++ dist/db_installer/sql/game/character_skills.sql (working copy)
|
||||
@@ -5,4 +5,6 @@
|
||||
`skill_level` INT(3) NOT NULL DEFAULT 1,
|
||||
@ -16,7 +16,7 @@ Index: dist/db_installer/sql/game/character_skills.sql
|
||||
\ No newline at end of file
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java (working copy)
|
||||
@@ -38,7 +38,7 @@
|
||||
protected void writeImpl()
|
||||
@ -29,7 +29,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.jav
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java (working copy)
|
||||
@@ -59,17 +59,17 @@
|
||||
|
||||
@ -63,7 +63,7 @@ Index: java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java (working copy)
|
||||
@@ -47,8 +47,8 @@
|
||||
public static final int M_ATK = 0x16;
|
||||
@ -78,7 +78,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java
|
||||
public static final int MAX_CP = 0x22;
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java (working copy)
|
||||
@@ -52,6 +52,7 @@
|
||||
|
||||
@ -370,7 +370,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java (working copy)
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
@ -391,7 +391,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListA
|
||||
writeS(_clan.getLeaderName());
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java (revision 838)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java (working copy)
|
||||
@@ -22,6 +22,7 @@
|
||||
import java.util.Collections;
|
||||
@ -468,7 +468,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java
|
||||
writeD(_reuseDelay);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java (working copy)
|
||||
@@ -48,24 +48,24 @@
|
||||
// TODO: Unhardcode these
|
||||
@ -509,7 +509,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.j
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java (working copy)
|
||||
@@ -75,6 +75,5 @@
|
||||
}
|
||||
@ -520,7 +520,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java (working copy)
|
||||
@@ -18,12 +18,16 @@
|
||||
*/
|
||||
@ -614,7 +614,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java (working copy)
|
||||
@@ -71,6 +71,11 @@
|
||||
@Override
|
||||
@ -630,7 +630,7 @@ Index: java/com/l2jserver/gameserver/model/zone/type/L2JumpZone.java
|
||||
character.setInsideZone(ZoneId.JUMP, true);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java (working copy)
|
||||
@@ -18,12 +18,16 @@
|
||||
*/
|
||||
@ -904,7 +904,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java (working copy)
|
||||
@@ -76,7 +76,8 @@
|
||||
|
||||
@ -918,7 +918,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.jav
|
||||
public int getPledgeType()
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java (working copy)
|
||||
@@ -54,6 +54,8 @@
|
||||
writeD((int) _activeChar.getCurrentMp());
|
||||
@ -931,7 +931,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.ja
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java (working copy)
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
@ -1174,7 +1174,7 @@ Index: dist/game/data/stats/items/46100-46199.xml
|
||||
+</list>
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java (working copy)
|
||||
@@ -35,9 +35,9 @@
|
||||
public void writeImpl()
|
||||
@ -1192,7 +1192,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java (working copy)
|
||||
@@ -103,7 +103,7 @@
|
||||
return;
|
||||
@ -1205,7 +1205,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.j
|
||||
_log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar);
|
||||
Index: java/com/l2jserver/gameserver/model/skills/Skill.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/skills/Skill.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/skills/Skill.java (revision 850)
|
||||
+++ java/com/l2jserver/gameserver/model/skills/Skill.java (working copy)
|
||||
@@ -1308,7 +1308,7 @@
|
||||
{
|
||||
@ -1218,7 +1218,7 @@ Index: java/com/l2jserver/gameserver/model/skills/Skill.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java (revision 858)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java (working copy)
|
||||
@@ -48,22 +48,6 @@
|
||||
|
||||
@ -1290,7 +1290,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java (working copy)
|
||||
@@ -49,14 +49,14 @@
|
||||
protected void writeImpl()
|
||||
@ -1317,7 +1317,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java
|
||||
for (L2Henna henna : _hennas)
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/UseItem.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/UseItem.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/UseItem.java (revision 858)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/UseItem.java (working copy)
|
||||
@@ -31,7 +31,6 @@
|
||||
import com.l2jserver.gameserver.handler.IItemHandler;
|
||||
@ -1400,7 +1400,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/UseItem.java
|
||||
return;
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java (working copy)
|
||||
@@ -51,7 +51,7 @@
|
||||
protected final void writeImpl()
|
||||
@ -1413,7 +1413,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java
|
||||
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java (working copy)
|
||||
@@ -18,6 +18,9 @@
|
||||
*/
|
||||
@ -1459,7 +1459,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java (working copy)
|
||||
@@ -34,6 +34,7 @@
|
||||
private int _type;
|
||||
@ -1515,7 +1515,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java (working copy)
|
||||
@@ -43,10 +43,10 @@
|
||||
writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id
|
||||
@ -1534,7 +1534,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.jav
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java (working copy)
|
||||
@@ -381,6 +381,7 @@
|
||||
|
||||
@ -1566,7 +1566,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/appearance/RequestSha
|
||||
player.removeRequest(ShapeShiftingItemRequest.class);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java (working copy)
|
||||
@@ -63,7 +63,7 @@
|
||||
writeD(_enchantLevel);
|
||||
@ -1579,7 +1579,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java (revision 858)
|
||||
+++ java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java (working copy)
|
||||
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
@ -1590,7 +1590,7 @@ Index: java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
|
||||
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
|
||||
import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
|
||||
import com.l2jserver.gameserver.model.variables.PlayerVariables;
|
||||
@@ -323,11 +325,16 @@
|
||||
@@ -322,11 +324,16 @@
|
||||
_sp = sp;
|
||||
}
|
||||
|
||||
@ -1606,10 +1606,10 @@ Index: java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
|
||||
+ return _paperdoll[slot][2];
|
||||
+ }
|
||||
+
|
||||
public void setKarma(int karma)
|
||||
public void setReputation(int reputation)
|
||||
{
|
||||
_karma = karma;
|
||||
@@ -432,4 +439,71 @@
|
||||
_reputation = reputation;
|
||||
@@ -421,4 +428,66 @@
|
||||
{
|
||||
return _vars.getBoolean("hairAccessoryEnabled", true);
|
||||
}
|
||||
@ -1661,11 +1661,6 @@ Index: java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
|
||||
+ return Hero.getInstance().isHero(getObjectId());
|
||||
+ }
|
||||
+
|
||||
+ public int getReputationInfo()
|
||||
+ {
|
||||
+ return getKarma() > 0 ? getKarma() * -1 : getReputation();
|
||||
+ }
|
||||
+
|
||||
+ public int get1stAugmentationId()
|
||||
+ {
|
||||
+ return 0x0000FFFF & getAugmentationId();
|
||||
@ -1683,7 +1678,7 @@ Index: java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java (working copy)
|
||||
@@ -35,6 +35,7 @@
|
||||
private int _objectId;
|
||||
@ -1712,7 +1707,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java
|
||||
@Override
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java (working copy)
|
||||
@@ -123,9 +123,11 @@
|
||||
writeD(_textType.getClientId());
|
||||
@ -1747,7 +1742,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java
|
||||
\ No newline at end of file
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java (working copy)
|
||||
@@ -126,6 +126,9 @@
|
||||
1132, 1133, 1134, 1135,
|
||||
@ -1761,7 +1756,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.jav
|
||||
5008, 5009, 5010, 5011,
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java (working copy)
|
||||
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
@ -1795,7 +1790,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java
|
||||
\ No newline at end of file
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeItemList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeItemList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeItemList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeItemList.java (working copy)
|
||||
@@ -24,7 +24,7 @@
|
||||
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
|
||||
@ -1808,7 +1803,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeItem
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java (working copy)
|
||||
@@ -21,6 +21,8 @@
|
||||
import java.util.ArrayList;
|
||||
@ -1843,7 +1838,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java (revision 859)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java (working copy)
|
||||
@@ -62,23 +62,19 @@
|
||||
_npc = npc;
|
||||
@ -1881,7 +1876,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java
|
||||
addComponentType(NpcInfoType.TEAM);
|
||||
}
|
||||
|
||||
- if (npc.getState() > 0)
|
||||
- if (npc.getDisplayEffect() > 0)
|
||||
- {
|
||||
- addComponentType(NpcInfoType.DISPLAY_EFFECT);
|
||||
- }
|
||||
@ -1991,9 +1986,16 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java
|
||||
}
|
||||
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))
|
||||
{
|
||||
@@ -401,4 +371,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java (working copy)
|
||||
@@ -76,9 +76,10 @@
|
||||
writeC(item.getItem().getType2()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
|
||||
@ -2037,7 +2039,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.ja
|
||||
|
||||
Index: java/com/l2jserver/gameserver/model/actor/L2Character.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/actor/L2Character.java (revision 839)
|
||||
--- java/com/l2jserver/gameserver/model/actor/L2Character.java (revision 858)
|
||||
+++ java/com/l2jserver/gameserver/model/actor/L2Character.java (working copy)
|
||||
@@ -86,6 +86,7 @@
|
||||
import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
|
||||
@ -2077,7 +2079,7 @@ Index: java/com/l2jserver/gameserver/model/actor/L2Character.java
|
||||
if (isPlayer() && !skill.isAbnormalInstant())
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java (working copy)
|
||||
@@ -22,15 +22,18 @@
|
||||
{
|
||||
@ -2110,7 +2112,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java (working copy)
|
||||
@@ -414,12 +414,8 @@
|
||||
}
|
||||
@ -2201,7 +2203,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket
|
||||
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java (working copy)
|
||||
@@ -87,7 +87,7 @@
|
||||
_log.log(Level.SEVERE, "Error:", e);
|
||||
@ -2214,7 +2216,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -2260,7 +2262,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.j
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -2286,7 +2288,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java (working copy)
|
||||
@@ -34,7 +34,7 @@
|
||||
protected final void writeImpl()
|
||||
@ -2299,7 +2301,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java (working copy)
|
||||
@@ -36,6 +36,6 @@
|
||||
writeD(_charObjId);
|
||||
@ -2375,7 +2377,7 @@ Index: java/com/l2jserver/gameserver/model/skills/BlowSuccess.java
|
||||
+}
|
||||
Index: java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java (working copy)
|
||||
@@ -280,7 +280,7 @@
|
||||
{
|
||||
@ -2460,7 +2462,7 @@ Index: java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java
|
||||
for (n = first; n != null; n = n.getNextSibling())
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java (working copy)
|
||||
@@ -48,7 +48,16 @@
|
||||
for (Skill skill : _skills)
|
||||
@ -2482,7 +2484,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java
|
||||
writeC(isDisabled && skill.isClanSkill() ? 1 : 0);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java (working copy)
|
||||
@@ -22,7 +22,9 @@
|
||||
import java.util.Objects;
|
||||
@ -2530,7 +2532,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -2551,7 +2553,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPart
|
||||
player.sendPacket(sm);
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java (working copy)
|
||||
@@ -43,6 +43,10 @@
|
||||
_page = slot / 12;
|
||||
@ -2566,7 +2568,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.ja
|
||||
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java (working copy)
|
||||
@@ -36,7 +36,7 @@
|
||||
protected void writeImpl()
|
||||
@ -2579,7 +2581,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContac
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java (working copy)
|
||||
@@ -49,15 +49,15 @@
|
||||
protected void writeImpl()
|
||||
@ -2608,7 +2610,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java (working copy)
|
||||
@@ -25,7 +25,6 @@
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
@ -2707,7 +2709,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.ja
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java (working copy)
|
||||
@@ -21,6 +21,7 @@
|
||||
import java.util.ArrayList;
|
||||
@ -2730,7 +2732,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java (working copy)
|
||||
@@ -125,5 +125,6 @@
|
||||
writeQ(temp.count);
|
||||
@ -2742,7 +2744,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java
|
||||
\ No newline at end of file
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java (working copy)
|
||||
@@ -48,6 +48,6 @@
|
||||
writeD(_room.getLootType());
|
||||
@ -2754,7 +2756,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java (working copy)
|
||||
@@ -54,7 +54,7 @@
|
||||
if ((info != null) && info.isInUse())
|
||||
@ -2767,7 +2769,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java (working copy)
|
||||
@@ -70,7 +70,8 @@
|
||||
writeC(0x00); // Filler (always 0)
|
||||
@ -2781,7 +2783,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java
|
||||
writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java (working copy)
|
||||
@@ -21,6 +21,7 @@
|
||||
import java.util.Arrays;
|
||||
@ -2826,7 +2828,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.ja
|
||||
{
|
||||
Index: dist/db_installer/sql/game/character_shortcuts.sql
|
||||
===================================================================
|
||||
--- dist/db_installer/sql/game/character_shortcuts.sql (revision 834)
|
||||
--- dist/db_installer/sql/game/character_shortcuts.sql (revision 848)
|
||||
+++ dist/db_installer/sql/game/character_shortcuts.sql (working copy)
|
||||
@@ -9,4 +9,5 @@
|
||||
`class_index` int(1) NOT NULL DEFAULT '0',
|
||||
@ -2839,7 +2841,7 @@ Index: dist/db_installer/sql/game/character_shortcuts.sql
|
||||
\ No newline at end of file
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java (working copy)
|
||||
@@ -34,5 +34,6 @@
|
||||
{
|
||||
@ -2850,7 +2852,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/L2GamePacketHandler.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/L2GamePacketHandler.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/L2GamePacketHandler.java (working copy)
|
||||
@@ -467,6 +467,9 @@
|
||||
case 0x67:
|
||||
@ -2882,7 +2884,7 @@ Index: java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
|
||||
msg = new RequestFortressMapInfo();
|
||||
Index: java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java (working copy)
|
||||
@@ -53,6 +53,14 @@
|
||||
public static final int CHANGE_ENCHANT_BOOK = 30299;
|
||||
@ -2901,7 +2903,7 @@ Index: java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java
|
||||
private final Map<Integer, L2EnchantSkillLearn> _enchantSkillTrees = new HashMap<>();
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java (working copy)
|
||||
@@ -41,5 +41,7 @@
|
||||
writeD(_player.getMaxMp());
|
||||
@ -2913,7 +2915,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.ja
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java (revision 858)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java (working copy)
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
@ -2954,7 +2956,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.j
|
||||
writeC(_activeChar.getInventory().canEquipCloak() ? 1 : 0); // CT2.3
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java (working copy)
|
||||
@@ -49,7 +49,7 @@
|
||||
}
|
||||
@ -2967,7 +2969,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
|
||||
final CharSelectInfoPackage charInfo = getClient().getCharSelection(_charSlot);
|
||||
Index: java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java (working copy)
|
||||
@@ -71,39 +71,114 @@
|
||||
public static final long MAX_ADENA = Config.MAX_ADENA;
|
||||
@ -3348,7 +3350,7 @@ Index: java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
|
||||
public boolean canEquipCloak()
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -3369,7 +3371,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.j
|
||||
writeD(_clan.getCrestId());
|
||||
Index: java/com/l2jserver/gameserver/model/ItemInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/ItemInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/ItemInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/model/ItemInfo.java (working copy)
|
||||
@@ -325,6 +325,16 @@
|
||||
return _augmentation;
|
||||
@ -3390,7 +3392,7 @@ Index: java/com/l2jserver/gameserver/model/ItemInfo.java
|
||||
return _count;
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -3411,7 +3413,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java (working copy)
|
||||
@@ -79,7 +79,7 @@
|
||||
sm.addString(activeChar.getClan().getAllyName());
|
||||
@ -3424,7 +3426,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java
|
||||
@Override
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java (working copy)
|
||||
@@ -33,14 +33,14 @@
|
||||
private static final String _C__D0_52_REQUESTWITHDRAWPREMIUMITEM = "[C] D0:52 RequestWithDrawPremiumItem";
|
||||
@ -3461,7 +3463,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiu
|
||||
Util.handleIllegalPlayerAction(activeChar, "[RequestWithDrawPremiumItem] Player: " + activeChar.getName() + " try to get item with empty list!", Config.DEFAULT_PUNISH);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java (working copy)
|
||||
@@ -20,9 +20,9 @@
|
||||
|
||||
@ -3477,7 +3479,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java
|
||||
private final int _time;
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/Die.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/Die.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/Die.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/Die.java (working copy)
|
||||
@@ -45,9 +45,7 @@
|
||||
private final boolean _isSweepable;
|
||||
@ -3535,7 +3537,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/Die.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java (working copy)
|
||||
@@ -54,11 +54,28 @@
|
||||
writeD(getFromList(Inventory.PAPERDOLL_LEGS));
|
||||
@ -3570,7 +3572,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java
|
||||
private int getFromList(int key)
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -3616,7 +3618,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.jav
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExUserInfoEquipSlot.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExUserInfoEquipSlot.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExUserInfoEquipSlot.java (working copy)
|
||||
@@ -79,10 +79,11 @@
|
||||
{
|
||||
@ -3634,7 +3636,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExUserInfoEquipSlot.j
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java (working copy)
|
||||
@@ -120,6 +120,15 @@
|
||||
case S84:
|
||||
@ -3654,7 +3656,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelI
|
||||
default:
|
||||
Index: dist/game/config/Server.ini
|
||||
===================================================================
|
||||
--- dist/game/config/Server.ini (revision 834)
|
||||
--- dist/game/config/Server.ini (revision 848)
|
||||
+++ dist/game/config/Server.ini (working copy)
|
||||
@@ -93,9 +93,9 @@
|
||||
# Numbers of protocol revisions that server allows to connect.
|
||||
@ -3671,7 +3673,7 @@ Index: dist/game/config/Server.ini
|
||||
# Notes:
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -3691,7 +3693,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.
|
||||
writeD(_clan.getCastleId());
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java (working copy)
|
||||
@@ -24,13 +24,15 @@
|
||||
private final String _subPledgeName;
|
||||
@ -3732,7 +3734,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java
|
||||
}
|
||||
Index: dist/db_installer/sql/game/character_skills_save.sql
|
||||
===================================================================
|
||||
--- dist/db_installer/sql/game/character_skills_save.sql (revision 834)
|
||||
--- dist/db_installer/sql/game/character_skills_save.sql (revision 848)
|
||||
+++ dist/db_installer/sql/game/character_skills_save.sql (working copy)
|
||||
@@ -10,4 +10,6 @@
|
||||
`class_index` INT(1) NOT NULL DEFAULT 0,
|
||||
@ -3746,7 +3748,7 @@ Index: dist/db_installer/sql/game/character_skills_save.sql
|
||||
\ No newline at end of file
|
||||
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java (working copy)
|
||||
@@ -34,12 +34,21 @@
|
||||
|
||||
@ -3773,7 +3775,7 @@ Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill
|
||||
@Override
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/SkillList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/SkillList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/SkillList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/SkillList.java (working copy)
|
||||
@@ -21,6 +21,8 @@
|
||||
import java.util.ArrayList;
|
||||
@ -3804,7 +3806,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/SkillList.java
|
||||
writeC(temp.disabled ? 1 : 0); // iSkillDisabled
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java (working copy)
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
@ -3840,7 +3842,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java
|
||||
writeD(_shortcut.getCharacterType());
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java (working copy)
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
@ -3864,7 +3866,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java (working copy)
|
||||
@@ -29,7 +29,6 @@
|
||||
{
|
||||
@ -3892,7 +3894,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.jav
|
||||
writeD(_privateBuy);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java (working copy)
|
||||
@@ -36,7 +36,7 @@
|
||||
protected void writeImpl()
|
||||
@ -3905,7 +3907,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChan
|
||||
// left time in ms max is 16000 its 4m and state is automatically changed to quit
|
||||
Index: java/com/l2jserver/commons/mmocore/SendablePacket.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/commons/mmocore/SendablePacket.java (revision 834)
|
||||
--- java/com/l2jserver/commons/mmocore/SendablePacket.java (revision 848)
|
||||
+++ java/com/l2jserver/commons/mmocore/SendablePacket.java (working copy)
|
||||
@@ -43,6 +43,17 @@
|
||||
* 8bit integer (00)
|
||||
@ -3945,7 +3947,7 @@ Index: java/com/l2jserver/commons/mmocore/SendablePacket.java
|
||||
* @param value
|
||||
Index: java/com/l2jserver/gameserver/enums/InventorySlot.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/enums/InventorySlot.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/enums/InventorySlot.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/enums/InventorySlot.java (working copy)
|
||||
@@ -40,25 +40,25 @@
|
||||
LEGS(Inventory.PAPERDOLL_LEGS),
|
||||
@ -3989,7 +3991,7 @@ Index: java/com/l2jserver/gameserver/enums/InventorySlot.java
|
||||
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java (working copy)
|
||||
@@ -34,7 +34,7 @@
|
||||
protected void writeImpl()
|
||||
@ -4002,7 +4004,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInf
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java (working copy)
|
||||
@@ -879,7 +879,7 @@
|
||||
|
||||
@ -4015,7 +4017,7 @@ Index: java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java (revision 858)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java (working copy)
|
||||
@@ -29,10 +29,8 @@
|
||||
import com.l2jserver.Config;
|
||||
@ -4054,15 +4056,14 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.jav
|
||||
public List<CharSelectInfoPackage> getCharInfo()
|
||||
{
|
||||
return _characterPackages;
|
||||
@@ -80,125 +68,115 @@
|
||||
// Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) )
|
||||
@@ -81,48 +69,37 @@
|
||||
writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT);
|
||||
writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char
|
||||
- writeC(0x01); // play mode, if 1 can create only 2 char in regular lobby
|
||||
writeC(0x01); // play mode, if 1 can create only 2 char in regular lobby
|
||||
- writeD(0x02); // if 1, korean client
|
||||
- writeC(0x00); // if 1 suggest premium account
|
||||
+ writeC(0x02); // play mode, if 1 can create only 2 char in regular lobby
|
||||
+ writeD(0x00); // if 1, korean client
|
||||
writeC(0x00); // if 1 suggest premium account
|
||||
|
||||
- long lastAccess = 0L;
|
||||
- if (_activeId == -1)
|
||||
@ -4126,32 +4127,16 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.jav
|
||||
writeD(charInfoPackage.getX());
|
||||
writeD(charInfoPackage.getY());
|
||||
writeD(charInfoPackage.getZ());
|
||||
writeF(charInfoPackage.getCurrentHp());
|
||||
writeF(charInfoPackage.getCurrentMp());
|
||||
-
|
||||
@@ -131,7 +108,7 @@
|
||||
|
||||
writeQ(charInfoPackage.getSp());
|
||||
writeQ(charInfoPackage.getExp());
|
||||
- writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High Five
|
||||
+ writeF(charInfoPackage.getExpPercent());
|
||||
writeD(charInfoPackage.getLevel());
|
||||
-
|
||||
- writeD(charInfoPackage.getKarma() > 0 ? charInfoPackage.getKarma() * -1 : charInfoPackage.getReputation());
|
||||
+ writeD(charInfoPackage.getReputationInfo());
|
||||
writeD(charInfoPackage.getPkKills());
|
||||
writeD(charInfoPackage.getPvPKills());
|
||||
|
||||
- writeD(0x00);
|
||||
- writeD(0x00);
|
||||
- writeD(0x00);
|
||||
- writeD(0x00);
|
||||
- writeD(0x00);
|
||||
- writeD(0x00);
|
||||
- writeD(0x00);
|
||||
+ for (int j = 0; j < 7; j++)
|
||||
+ {
|
||||
+ writeD(0x00);
|
||||
+ }
|
||||
|
||||
writeD(charInfoPackage.getReputation());
|
||||
@@ -149,52 +126,50 @@
|
||||
writeD(0x00); // Ertheia
|
||||
writeD(0x00); // Ertheia
|
||||
|
||||
@ -4179,17 +4164,17 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.jav
|
||||
writeD(charInfoPackage.getHairStyle());
|
||||
writeD(charInfoPackage.getHairColor());
|
||||
writeD(charInfoPackage.getFace());
|
||||
-
|
||||
|
||||
- writeF(charInfoPackage.getMaxHp()); // hp max
|
||||
- writeF(charInfoPackage.getMaxMp()); // mp max
|
||||
-
|
||||
- writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0);
|
||||
+ writeF(charInfoPackage.getMaxHp());
|
||||
+ writeF(charInfoPackage.getMaxMp());
|
||||
|
||||
- writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0);
|
||||
+ writeD(charInfoPackage.getDeleteTime());
|
||||
writeD(charInfoPackage.getClassId());
|
||||
- writeD(i == _activeId ? 1 : 0);
|
||||
+ writeD(isSelected(charId, charInfoPackage));
|
||||
+ writeD(charId == charInfoPackage.getObjectId() ? 0x01 : 0x00);
|
||||
+ writeC(charInfoPackage.getWeaponEnchantEffect());
|
||||
+ writeD(charInfoPackage.get1stAugmentationId());
|
||||
+ writeD(charInfoPackage.get2ndAugmentationId());
|
||||
@ -4227,25 +4212,11 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.jav
|
||||
+ writeD(charInfoPackage.getVitalityItemCount());
|
||||
+ writeD(charInfoPackage.isAvailable());
|
||||
+ writeC(0x00);
|
||||
+ writeC(charInfoPackage.isHero());
|
||||
+ writeC(charInfoPackage.isHero()); // hero glow
|
||||
writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // show hair accessory if enabled
|
||||
}
|
||||
}
|
||||
|
||||
+ /**
|
||||
+ * @param charId
|
||||
+ * @param charInfoPackage
|
||||
+ * @return
|
||||
+ */
|
||||
+ private int isSelected(int charId, CharSelectInfoPackage charInfoPackage)
|
||||
+ {
|
||||
+ return charId == charInfoPackage.getObjectId() ? 0x01 : 0x00;
|
||||
+ }
|
||||
+
|
||||
private static List<CharSelectInfoPackage> loadCharacterSelectInfo(String loginName)
|
||||
{
|
||||
final List<CharSelectInfoPackage> characterList = new ArrayList<>();
|
||||
@@ -255,7 +233,7 @@
|
||||
@@ -255,7 +230,7 @@
|
||||
String name = chardata.getString("char_name");
|
||||
|
||||
// See if the char must be deleted
|
||||
@ -4256,7 +4227,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.jav
|
||||
if (System.currentTimeMillis() > deletetime)
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java (working copy)
|
||||
@@ -21,6 +21,8 @@
|
||||
import java.util.ArrayList;
|
||||
@ -4306,7 +4277,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExAbnormalStatusUpdat
|
||||
writeD(info._caster);
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java (working copy)
|
||||
@@ -70,7 +70,7 @@
|
||||
writeD(hair.getAdena());
|
||||
@ -4337,7 +4308,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExBeautyItemList.java
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java (working copy)
|
||||
@@ -34,7 +34,7 @@
|
||||
protected void writeImpl()
|
||||
@ -4350,7 +4321,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.j
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java (working copy)
|
||||
@@ -63,9 +63,9 @@
|
||||
protected final void writeImpl()
|
||||
@ -4366,7 +4337,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.
|
||||
{
|
||||
Index: java/com/l2jserver/gameserver/enums/PartySmallWindowUpdateType.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/enums/PartySmallWindowUpdateType.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/enums/PartySmallWindowUpdateType.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/enums/PartySmallWindowUpdateType.java (working copy)
|
||||
@@ -33,7 +33,7 @@
|
||||
MAX_MP(0x20),
|
||||
@ -4379,7 +4350,7 @@ Index: java/com/l2jserver/gameserver/enums/PartySmallWindowUpdateType.java
|
||||
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java (working copy)
|
||||
@@ -64,7 +64,7 @@
|
||||
_sysMessageId = -1;
|
||||
@ -4455,7 +4426,7 @@ Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.j
|
||||
}
|
||||
Index: java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
|
||||
===================================================================
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java (revision 834)
|
||||
--- java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java (revision 848)
|
||||
+++ java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java (working copy)
|
||||
@@ -22,6 +22,7 @@
|
||||
import java.util.List;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user