Sync with L2JServer Jan 28th 2015.

This commit is contained in:
mobius
2015-01-29 05:18:04 +00:00
parent 59e1db4a68
commit 2cb3a52ed2
224 changed files with 4690 additions and 835 deletions

View File

@@ -41,6 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
@@ -766,6 +767,12 @@ public final class L2PcInstance extends L2Playable
private int _activeEnchantAttrItemId = ID_NONE;
private long _activeEnchantTimestamp = 0;
private int _firstCompoundOID = -1;
private int _secondCompoundOID = -1;
private L2ItemInstance _usingAStone = null;
private L2ItemInstance _appearanceItem = null;
private L2ItemInstance _targetAppearanceItem = null;
protected boolean _inventoryDisable = false;
/** Player's cubics. */
private final Map<Integer, L2CubicInstance> _cubics = new ConcurrentSkipListMap<>();
@@ -13614,6 +13621,13 @@ public final class L2PcInstance extends L2Playable
return -1;
}
public int getBirthdays()
{
long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000;
time /= TimeUnit.DAYS.toMillis(365);
return (int) time;
}
/**
* list of character friends
*/
@@ -15078,9 +15092,6 @@ public final class L2PcInstance extends L2Playable
_vitalityPoints = points;
}
int _firstCompoundOID = -1;
int _secondCompoundOID = -1;
public int getFirstCompoundOID()
{
return _firstCompoundOID;
@@ -15101,8 +15112,6 @@ public final class L2PcInstance extends L2Playable
_secondCompoundOID = secondCompoundOID;
}
L2ItemInstance _usingAStone = null;
public L2ItemInstance getUsingAppearanceStone()
{
return _usingAStone;
@@ -15113,9 +15122,6 @@ public final class L2PcInstance extends L2Playable
_usingAStone = stone;
}
L2ItemInstance _appearanceItem = null;
L2ItemInstance _targetAppearanceItem = null;
public L2ItemInstance getAppearanceItem()
{
return _appearanceItem;
@@ -15135,4 +15141,21 @@ public final class L2PcInstance extends L2Playable
{
_targetAppearanceItem = item;
}
/**
* @return the prime shop points of the player.
*/
public int getPrimePoints()
{
return getAccountVariables().getInt("PrimePoints", 0);
}
/**
* Sets prime shop for current player.
* @param points
*/
public void setPrimePoints(int points)
{
getAccountVariables().set("PrimePoints", points);
}
}