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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java
View File

@ -39,9 +39,9 @@ import javolution.util.FastSet;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.ItemTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.instancemanager.CastleManager;
@ -117,6 +117,7 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.interfaces.IPositionable;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
import com.l2jserver.gameserver.model.items.L2EtcItem;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.olympiad.Olympiad;
@ -2016,8 +2017,8 @@ public abstract class AbstractScript extends ManagedScript
return;
}
final L2ItemInstance _tmpItem = ItemTable.getInstance().createDummyItem(itemId);
if (_tmpItem == null)
final L2Item item = ItemTable.getInstance().getTemplate(itemId);
if (item == null)
{
return;
}
@ -2030,9 +2031,9 @@ public abstract class AbstractScript extends ManagedScript
}
else if (Config.RATE_QUEST_REWARD_USE_MULTIPLIERS)
{
if (_tmpItem.isEtcItem())
if (item instanceof L2EtcItem)
{
switch (_tmpItem.getEtcItem().getItemType())
switch (((L2EtcItem) item).getItemType())
{
case POTION:
count *= Config.RATE_QUEST_REWARD_POTION;
@ -2064,13 +2065,13 @@ public abstract class AbstractScript extends ManagedScript
}
// Add items to player's inventory
L2ItemInstance item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
if (item == null)
final L2ItemInstance itemInstance = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
if (itemInstance == null)
{
return;
}
sendItemGetMessage(player, item, count);
sendItemGetMessage(player, itemInstance, count);
}
/**
@ -2586,7 +2587,7 @@ public abstract class AbstractScript extends ManagedScript
L2DoorInstance door = null;
if (instanceId <= 0)
{
door = DoorTable.getInstance().getDoor(doorId);
door = DoorData.getInstance().getDoor(doorId);
}
else
{
@ -2649,6 +2650,17 @@ public abstract class AbstractScript extends ManagedScript
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
/**
* Adds desire to move to the given NPC.
* @param npc the NPC
* @param loc the location
* @param desire the desire
*/
protected void addMoveToDesire(L2Npc npc, Location loc, int desire)
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, loc);
}
/**
* Instantly cast a skill upon the given target.
* @param npc the caster NPC