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

Sync with L2jServer HighFive Oct 2nd 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-10-03 13:41:08 +00:00
parent c90d8eb135
commit 7259087da5
18 changed files with 469 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDuelEnd.java
View File

@ -19,15 +19,19 @@
package com.l2jserver.gameserver.network.serverpackets;
/**
* @author KenM
* Duel End packet implementation.
* @author KenM, Zoey76
*/
public class ExDuelEnd extends L2GameServerPacket
{
private final int _unk1;
public static final ExDuelEnd PLAYER_DUEL = new ExDuelEnd(false);
public static final ExDuelEnd PARTY_DUEL = new ExDuelEnd(true);
public ExDuelEnd(int unk1)
private final int _partyDuel;
private ExDuelEnd(boolean isPartyDuel)
{
_unk1 = unk1;
_partyDuel = isPartyDuel ? 1 : 0;
}
@Override
@ -36,6 +40,6 @@ public class ExDuelEnd extends L2GameServerPacket
writeC(0xFE);
writeH(0x50);
writeD(_unk1);
writeD(_partyDuel);
}
}

14
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDuelReady.java
View File

@ -19,15 +19,19 @@
package com.l2jserver.gameserver.network.serverpackets;
/**
* @author KenM
* Duel Ready packet implementation.
* @author KenM, Zoey76
*/
public class ExDuelReady extends L2GameServerPacket
{
private final int _unk1;
public static final ExDuelReady PLAYER_DUEL = new ExDuelReady(false);
public static final ExDuelReady PARTY_DUEL = new ExDuelReady(true);
public ExDuelReady(int unk1)
private final boolean _partyDuel;
public ExDuelReady(boolean partyDuel)
{
_unk1 = unk1;
_partyDuel = partyDuel;
}
@Override
@ -36,6 +40,6 @@ public class ExDuelReady extends L2GameServerPacket
writeC(0xFE);
writeH(0x4E);
writeD(_unk1);
writeD(_partyDuel ? 1 : 0);
}
}

14
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExDuelStart.java
View File

@ -19,15 +19,19 @@
package com.l2jserver.gameserver.network.serverpackets;
/**
* @author KenM
* Duel Start packet implementation.
* @author KenM, Zoey76
*/
public class ExDuelStart extends L2GameServerPacket
{
private final int _unk1;
public static final ExDuelReady PLAYER_DUEL = new ExDuelReady(false);
public static final ExDuelReady PARTY_DUEL = new ExDuelReady(true);
public ExDuelStart(int unk1)
private final boolean _partyDuel;
public ExDuelStart(boolean partyDuel)
{
_unk1 = unk1;
_partyDuel = partyDuel;
}
@Override
@ -36,6 +40,6 @@ public class ExDuelStart extends L2GameServerPacket
writeC(0xFE);
writeH(0x4F);
writeD(_unk1);
writeD(_partyDuel ? 1 : 0);
}
}

12
trunk/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java
View File

@ -24,7 +24,6 @@ import java.util.List;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.interfaces.IPositionable;
/**
@ -50,16 +49,7 @@ public final class MagicSkillUse extends L2GameServerPacket
_skillLevel = skillLevel;
_hitTime = hitTime;
_reuseDelay = reuseDelay;
Location skillWorldPos = null;
if (cha.isPlayer())
{
final L2PcInstance player = cha.getActingPlayer();
if (player.getCurrentSkillWorldPosition() != null)
{
skillWorldPos = player.getCurrentSkillWorldPosition();
}
}
_groundLocations = skillWorldPos != null ? Arrays.asList(skillWorldPos) : Collections.<Location> emptyList();
_groundLocations = cha.isPlayer() && (cha.getActingPlayer().getCurrentSkillWorldPosition() != null) ? Arrays.asList(cha.getActingPlayer().getCurrentSkillWorldPosition()) : Collections.<Location> emptyList();
}
public MagicSkillUse(L2Character cha, int skillId, int skillLevel, int hitTime, int reuseDelay)