Changeset 992

(2010/02/07 23:56) About 2 years ago

Fix for skills usage restriction (self heal was not working when current target was dead mob)

Affected files

	991		992
67	PacketSendUtility.broadcastPacket(player, new SM_ITEM_USAGE_ANIMATION(player.getObjectId(),	67	PacketSendUtility.broadcastPacket(player, new SM_ITEM_USAGE_ANIMATION(player.getObjectId(),
68	parentItem.getObjectId(), parentItem.getItemTemplate().getItemId()), true);	68	parentItem.getObjectId(), parentItem.getItemTemplate().getItemId()), true);
69	skill.useSkill(SkillType.ITEM);	69	skill.useSkill(SkillType.ITEM);
70		70
71	Item item = player.getInventory().getItemByObjId(parentItem.getObjectId());	71	player.getInventory().removeFromBagByObjectId(parentItem.getObjectId(), 1);
72	if (item.getItemCount() > 1)
73	{
74	parentItem.decreaseItemCount(1);
75	PacketSendUtility.sendPacket(player, new SM_UPDATE_ITEM(item));
76	}
77	else
78	{
79	player.getInventory().removeFromBag(item);
80	PacketSendUtility.sendPacket(player, new SM_DELETE_ITEM(parentItem.getObjectId()));
81	}
82	}	72	}
83	}	73	}
84		74

 import com.aionemu.gameserver.model.gameobjects.Creature;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_CASTSPELL;
+import com.aionemu.gameserver.restrictions.RestrictionsManager;
 import com.aionemu.gameserver.skillengine.action.Action;
 import com.aionemu.gameserver.skillengine.action.Actions;
 import com.aionemu.gameserver.skillengine.condition.Condition;
 		if(!setProperties(skillTemplate.getSetproperties()))
 			return;
+		if (!RestrictionsManager.canUseSkill(getEffector(), getFirstTarget()))
+			return;
 		//temporary hook till i find permanent solution
 		if(skillType == SkillType.CAST)
 		{

 				break;
 			//TODO other enum values
 		}
-		if (!RestrictionsManager.canUseSkill(skill.getEffector(), skill.getFirstTarget()))
-			return false;
 		if(skill.getFirstTarget() != null)
 			skill.getEffectedList().add(skill.getFirstTarget());
 		return true;

 					skill.setFirstTarget(skill.getEffector());
 					effectedList.add(skill.getEffector());
 				}
+				else
+				{
+					skill.setFirstTarget(effectedList.get(0));
+				}
 				break;