Fixed Talking Island and Faeron Village scrolls of escape.

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

View File

@@ -1,55 +0,0 @@
/*
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.model.itemcontainer;
import com.l2jserver.gameserver.enums.ItemLocation;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author Erlandys
*/
public class PcAuction extends ItemContainer
{
private final L2PcInstance _owner;
public PcAuction(L2PcInstance owner)
{
_owner = owner;
}
@Override
public String getName()
{
return "Auction";
}
@Override
public L2PcInstance getOwner()
{
return _owner;
}
@Override
public ItemLocation getBaseLocation()
{
return ItemLocation.AUCTION_HOUSE;
}
@Override
public boolean validateCapacity(long slots)
{
return ((_items.size() + slots) <= 10);
}
}

View File

@@ -822,9 +822,9 @@ public class PcInventory extends Inventory
getOwner().removeItemFromShortCut(item.getObjectId());
// Removes active Enchant Scroll
if (item.getObjectId() == getOwner().getActiveEnchantItemId())
if (getOwner().isProcessingItem(item.getObjectId()))
{
getOwner().setActiveEnchantItemId(L2PcInstance.ID_NONE);
getOwner().removeRequestsThatProcessesItem(item.getObjectId());
}
if (item.getId() == ADENA_ID)