Sync with L2jServer HighFive Mar 25th 2015.

This commit is contained in:
MobiusDev
2015-03-25 06:48:51 +00:00
parent e0c66b1412
commit 82606870c0
194 changed files with 2619 additions and 2869 deletions

View File

@@ -25,8 +25,8 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -61,7 +61,7 @@ public class Auction
private long _currentBid = 0;
private long _startingBid = 0;
private final Map<Integer, Bidder> _bidders = new HashMap<>();
private final Map<Integer, Bidder> _bidders = new ConcurrentHashMap<>();
private static final String[] ItemTypeName =
{
@@ -333,7 +333,7 @@ public class Auction
{
try (Connection con = L2DatabaseFactory.getInstance().getConnection())
{
if (getBidders().get(bidder.getClanId()) != null)
if (_bidders.get(bidder.getClanId()) != null)
{
try (PreparedStatement statement = con.prepareStatement("UPDATE auction_bid SET bidderId=?, bidderName=?, maxBid=?, time_bid=? WHERE auctionId=? AND bidderId=?"))
{