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

Sync with L2jServer HighFive Feb 15th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-15 23:48:35 +00:00
parent f2d6aedabe
commit 06c765ea63
45 changed files with 474 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java
View File

@ -32,6 +32,7 @@ import com.l2jserver.Config;
import com.l2jserver.gameserver.ItemsAutoDestroy;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.ItemTable;
import com.l2jserver.gameserver.datatables.NpcPersonalAIData;
import com.l2jserver.gameserver.enums.AISkillScope;
@ -173,6 +174,15 @@ public class L2Npc extends L2Character
setIsFlying(template.isFlying());
}
/**
* Creates a NPC.
* @param npcId the NPC ID
*/
public L2Npc(int npcId)
{
this(NpcData.getInstance().getTemplate(npcId));
}
public int getSoulShotChance()
{
return getTemplate().getSoulShotChance();

17
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -717,6 +717,7 @@ public final class L2PcInstance extends L2Playable
private boolean _exchangeRefusal = false; // Exchange refusal
private L2Party _party;
PartyDistributionType _partyDistributionType;
// this is needed to find the inviting player for Party response
// there can only be one active party request at once
@ -6771,6 +6772,16 @@ public final class L2PcInstance extends L2Playable
return _party;
}
public void setPartyDistributionType(PartyDistributionType pdt)
{
_partyDistributionType = pdt;
}
public PartyDistributionType getPartyDistributionType()
{
return _partyDistributionType;
}
/**
* Return True if the L2PcInstance is a GM.
*/
@ -10898,6 +10909,7 @@ public final class L2PcInstance extends L2Playable
super.doRevive();
updateEffectIcons();
sendPacket(new EtcStatusUpdate(this));
_revivePet = false;
_reviveRequested = 0;
_revivePower = 0;
@ -13496,6 +13508,11 @@ public final class L2PcInstance extends L2Playable
activeChar.sendPacket(new RecipeShopMsg(this));
break;
}
if (isMounted())
{
// Required double send for fix Mounted H5+
sendPacket(new CharInfo(activeChar));
}
}
public void showQuestMovie(int id)