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

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))));
}
}
}