Sync with L2jServer Ertheia Mar 27th 2015.

This commit is contained in:
MobiusDev
2015-03-28 08:46:39 +00:00
parent a8a6d2153b
commit 855ced1dc5
23 changed files with 93 additions and 84 deletions

View File

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.network.clientpackets;
import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
import java.util.ArrayList;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
@@ -225,9 +226,10 @@ public class MultiSellChoose extends L2GameClientPacket
}
}
ArrayList<L2Augmentation> augmentation = new ArrayList<>();
List<L2Augmentation> augmentation = new ArrayList<>();
Elementals[] elemental = null;
/** All ok, remove items and add final product */
for (Ingredient e : entry.getIngredients())
{
if (e.getItemId() < 0)

View File

@@ -63,6 +63,7 @@ public final class RequestGiveItemToPet extends L2GameClientPacket
{
return;
}
// Alt game - Karma punishment
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TRADE && (player.getKarma() > 0))
{

View File

@@ -155,6 +155,7 @@ public final class RequestJoinParty extends L2GameClientPacket
private void addTargetToParty(L2PcInstance target, L2PcInstance requestor)
{
final L2Party party = requestor.getParty();
// summary of ppl already in party and ppl that get invitation
if (!party.isLeader(requestor))
{

View File

@@ -53,7 +53,6 @@ public final class RequestRestart extends L2GameClientPacket
protected void runImpl()
{
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;