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

Sync with L2JServer Feb 3rd 2015.

Browse Source
This commit is contained in:
mobius
2015-02-03 21:11:57 +00:00
parent 9cf1a6d6e5
commit fe25f74122
169 changed files with 3379 additions and 5414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordAck.java
View File

@@ -23,13 +23,15 @@ package com.l2jserver.gameserver.network.serverpackets;
*/
public class Ex2ndPasswordAck extends L2GameServerPacket
{
int _response;
private final int _status;
private final int _response;
public static int SUCCESS = 0x00;
public static int WRONG_PATTERN = 0x01;
public Ex2ndPasswordAck(int response)
public Ex2ndPasswordAck(int status, int response)
{
_status = status;
_response = response;
}
@@ -38,7 +40,7 @@ public class Ex2ndPasswordAck extends L2GameServerPacket
{
writeC(0xFE);
writeH(0x107);
writeC(0x00);
writeC(_status);
writeD(_response == WRONG_PATTERN ? 0x01 : 0x00);
writeD(0x00);
}

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExInzoneWaiting.java
View File

@@ -50,7 +50,7 @@ public class ExInzoneWaiting extends L2GameServerPacket
writeD(_instanceTimes.size());
for (Entry<Integer, Long> entry : _instanceTimes.entrySet())
{
final long instanceTime = TimeUnit.MILLISECONDS.toMinutes(entry.getValue() - System.currentTimeMillis());
final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis());
writeD(entry.getKey());
writeD((int) instanceTime);
}

43
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
View File

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
import com.l2jserver.gameserver.model.holders.NpcLogListHolder;
import com.l2jserver.gameserver.network.NpcStringId;
/**
@@ -29,7 +30,7 @@ import com.l2jserver.gameserver.network.NpcStringId;
public class ExQuestNpcLogList extends L2GameServerPacket
{
private final int _questId;
private final List<Holder> _npcLogList = new ArrayList<>();
private final List<NpcLogListHolder> _npcLogList = new ArrayList<>();
public ExQuestNpcLogList(int questId)
{
@@ -38,12 +39,17 @@ public class ExQuestNpcLogList extends L2GameServerPacket
public void addNpc(int npcId, int count)
{
_npcLogList.add(new Holder(npcId, false, count));
_npcLogList.add(new NpcLogListHolder(npcId, false, count));
}
public void addNpcString(NpcStringId npcStringId, int count)
{
_npcLogList.add(new Holder(npcStringId.getId(), true, count));
_npcLogList.add(new NpcLogListHolder(npcStringId.getId(), true, count));
}
public void add(NpcLogListHolder holder)
{
_npcLogList.add(holder);
}
@Override
@@ -53,40 +59,11 @@ public class ExQuestNpcLogList extends L2GameServerPacket
writeH(0xC6);
writeD(_questId);
writeC(_npcLogList.size());
for (Holder holder : _npcLogList)
for (NpcLogListHolder holder : _npcLogList)
{
writeD((holder.getId()));
writeC(holder.isNpcString() ? 0x01 : 0x00);
writeD(holder.getCount());
}
}
private class Holder
{
private final int _id;
private final boolean _isNpcString;
private final int _count;
public Holder(int id, boolean isNpcString, int count)
{
_id = id;
_isNpcString = isNpcString;
_count = count;
}
public int getId()
{
return _id;
}
public boolean isNpcString()
{
return _isNpcString;
}
public int getCount()
{
return _count;
}
}
}

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

@@ -94,7 +94,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
addComponentType(NpcInfoType.TEAM);
}
if (npc.getDisplayEffect() > 0)
if (npc.getState() > 0)
{
addComponentType(NpcInfoType.DISPLAY_EFFECT);
}
@@ -327,7 +327,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
}
if (containsMask(NpcInfoType.DISPLAY_EFFECT))
{
writeD(_npc.getDisplayEffect());
writeD(_npc.getState());
}
if (containsMask(NpcInfoType.TRANSFORMATION))
{

8
trunk/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java
View File

@@ -24,6 +24,7 @@ import java.util.List;
public final class SkillList extends L2GameServerPacket
{
private final List<Skill> _skills = new ArrayList<>();
private int _lastLearnedSkillId = 0;
static class Skill
{
@@ -48,6 +49,11 @@ public final class SkillList extends L2GameServerPacket
_skills.add(new Skill(id, level, passive, disabled, enchanted));
}
public void setLastLearnedSkillId(int lastLearnedSkillId)
{
_lastLearnedSkillId = lastLearnedSkillId;
}
@Override
protected final void writeImpl()
{
@@ -63,6 +69,6 @@ public final class SkillList extends L2GameServerPacket
writeC(temp.disabled ? 1 : 0); // iSkillDisabled
writeC(temp.enchanted ? 1 : 0); // CanEnchant
}
writeD(0x00); // TODO: Find me!
writeD(_lastLearnedSkillId);
}
}

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantFail.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantFail.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantFail extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneFail.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantOneFail extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneOK.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantOneOK extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveFail.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantOneRemoveFail extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantOneRemoveOK.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantOneRemoveOK extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSucess.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantSucess.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantSucess extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoFail.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantTwoFail extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoOK.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantTwoOK extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveFail.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantTwoRemoveFail extends L2GameServerPacket
{

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantTwoRemoveOK.java → trunk/java/com/l2jserver/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
View File

@@ -16,7 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.network.serverpackets;
package com.l2jserver.gameserver.network.serverpackets.compound;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public class ExEnchantTwoRemoveOK extends L2GameServerPacket
{