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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java
View File

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.itemauction;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.model.L2Augmentation;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
/**
@@ -48,12 +47,7 @@ public final class AuctionItem
public final boolean checkItemExists()
{
final L2Item item = ItemTable.getInstance().getTemplate(_itemId);
if (item == null)
{
return false;
}
return true;
return ItemTable.getInstance().getTemplate(_itemId) != null;
}
public final int getAuctionItemId()

35
trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java
View File

@@ -364,36 +364,27 @@ public final class ItemAuction
break;
}
case EXTEND_BY_3_MIN:
if (Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID > 0)
if ((Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID > 0) && (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()))
{
if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId())
{
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A;
_endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID;
}
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A;
_endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID;
}
break;
case EXTEND_BY_CONFIG_PHASE_A:
{
if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId())
if ((getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) && (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B))
{
if (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B)
{
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B;
_endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID;
}
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B;
_endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID;
}
break;
}
case EXTEND_BY_CONFIG_PHASE_B:
{
if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId())
if ((getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) && (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A))
{
if (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A)
{
_endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID;
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A;
}
_endingTime += Config.ALT_ITEM_AUCTION_TIME_EXTENDS_ON_BID;
_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A;
}
}
}
@@ -510,12 +501,12 @@ public final class ItemAuction
private final boolean reduceItemCount(L2PcInstance player, long count)
{
if (!player.reduceAdena("ItemAuction", count, player, true))
if (player.reduceAdena("ItemAuction", count, player, true))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_FOR_THIS_BID);
return false;
return true;
}
return true;
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_FOR_THIS_BID);
return false;
}
private final void increaseItemCount(L2PcInstance player, long count)

25
trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java
View File

@@ -212,10 +212,9 @@ public final class ItemAuctionInstance
public final void shutdown()
{
final ScheduledFuture<?> stateTask = _stateTask;
if (stateTask != null)
if (_stateTask != null)
{
stateTask.cancel(false);
_stateTask.cancel(false);
}
}
@@ -291,16 +290,11 @@ public final class ItemAuctionInstance
for (ItemAuction auction : auctions)
{
if (auction.getAuctionState() == ItemAuctionState.STARTED)
if ((auction.getAuctionState() == ItemAuctionState.STARTED) || (auction.getStartingTime() <= currentTime))
{
currentAuction = auction;
break;
}
else if (auction.getStartingTime() <= currentTime)
{
currentAuction = auction;
break; // only first
}
}
for (ItemAuction auction : auctions)
@@ -355,13 +349,9 @@ public final class ItemAuctionInstance
final ArrayList<ItemAuction> stack = new ArrayList<>(auctions.size());
for (ItemAuction auction : getAuctions())
{
if (auction.getAuctionState() != ItemAuctionState.CREATED)
if ((auction.getAuctionState() != ItemAuctionState.CREATED) && (auction.getBidFor(bidderObjId) != null))
{
final ItemAuctionBid bid = auction.getBidFor(bidderObjId);
if (bid != null)
{
stack.add(auction);
}
stack.add(auction);
}
}
return stack.toArray(new ItemAuction[stack.size()]);
@@ -605,10 +595,7 @@ public final class ItemAuctionInstance
{
while (rs.next())
{
final int playerObjId = rs.getInt(1);
final long playerBid = rs.getLong(2);
final ItemAuctionBid bid = new ItemAuctionBid(playerObjId, playerBid);
auctionBids.add(bid);
auctionBids.add((new ItemAuctionBid(rs.getInt(1), rs.getLong(2))));
}
}
}