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

Fixed Talking Island and Faeron Village scrolls of escape.

Browse Source 
Dropped Batalion Zone due to lack of further development.
Added Various missing syncs from L2jServer Ertheia.
This commit is contained in:
MobiusDev
2015-04-22 16:48:31 +00:00
parent 2bc6b7a553
commit 2cf52bad9b
342 changed files with 5639 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/dist/game/data/scripts/handlers/itemhandlers/ChangeAttribute.java vendored
View File

@ -17,6 +17,7 @@ package handlers.itemhandlers;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.request.EnchantItemAttributeRequest;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExChangeAttributeItemList;
@ -42,13 +43,13 @@ public class ChangeAttribute implements IItemHandler
return false;
}
if (activeChar.isEnchanting())
if (activeChar.hasItemRequest())
{
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHANGING_ATTRIBUTES_IS_IN_PROGRESS_PLEASE_TRY_AGAIN_AFTER_ENDING_THE_PREVIOUS_TASK));
return false;
}
activeChar.setActiveEnchantAttrItemId(item.getId());
activeChar.addRequest(new EnchantItemAttributeRequest(activeChar, item.getObjectId()));
activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHANGING_ATTRIBUTES_IS_IN_PROGRESS_PLEASE_TRY_AGAIN_AFTER_ENDING_THE_PREVIOUS_TASK));
activeChar.sendPacket(new ExChangeAttributeItemList(activeChar, item.getObjectId()));
return true;

5
trunk/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java vendored
View File

@ -21,6 +21,7 @@ package handlers.itemhandlers;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.request.EnchantItemAttributeRequest;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExChooseInventoryAttributeItem;
@ -42,13 +43,13 @@ public class EnchantAttribute implements IItemHandler
return false;
}
if (activeChar.isEnchanting())
if (activeChar.hasItemRequest())
{
activeChar.sendPacket(SystemMessageId.ANOTHER_ENCHANTMENT_IS_IN_PROGRESS_PLEASE_COMPLETE_THE_PREVIOUS_TASK_THEN_TRY_AGAIN);
return false;
}
activeChar.setActiveEnchantAttrItemId(item.getObjectId());
activeChar.addRequest(new EnchantItemAttributeRequest(activeChar, item.getObjectId()));
activeChar.sendPacket(new ExChooseInventoryAttributeItem(activeChar, item));
return true;
}

5
trunk/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java vendored
View File

@ -21,6 +21,7 @@ package handlers.itemhandlers;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.request.EnchantItemRequest;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ChooseInventoryItem;
@ -42,13 +43,13 @@ public class EnchantScrolls implements IItemHandler
return false;
}
if (activeChar.isEnchanting())
if (activeChar.hasItemRequest())
{
activeChar.sendPacket(SystemMessageId.ANOTHER_ENCHANTMENT_IS_IN_PROGRESS_PLEASE_COMPLETE_THE_PREVIOUS_TASK_THEN_TRY_AGAIN);
return false;
}
activeChar.setActiveEnchantItemId(item.getObjectId());
activeChar.addRequest(new EnchantItemRequest(activeChar, item.getObjectId()));
activeChar.sendPacket(new ChooseInventoryItem(item.getId()));
return true;
}