|
|
@ -5114,49 +5114,29 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void update(Boolean newSystem) { |
|
|
|
public void update(Boolean newSystem) { |
|
|
|
|
|
|
|
|
|
|
|
this.updateLocation(); |
|
|
|
if(this.isAlive() && this.enteredWorld) { |
|
|
|
this.updateMovementState(); |
|
|
|
this.updateLocation(); |
|
|
|
|
|
|
|
this.updateMovementState(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(!newSystem) |
|
|
|
if(!newSystem) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
this.updateLocation(); |
|
|
|
|
|
|
|
this.updateMovementState(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|
|
|
|
|
|
|
|
|
if (this.updateLock.writeLock().tryLock()) { |
|
|
|
if (this.updateLock.writeLock().tryLock()) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
//if (!this.timestamps.contains("STAMHEALTICK")) {
|
|
|
|
|
|
|
|
// this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
//if (this.containsEffect(441156455)) {
|
|
|
|
|
|
|
|
// long length = System.currentTimeMillis() - this.timestamps.get("STAMHEALTICK").longValue();
|
|
|
|
|
|
|
|
// if (length > 10000 ) {
|
|
|
|
|
|
|
|
// float stamIncrease = 6.5f;
|
|
|
|
|
|
|
|
// if (this.stamina.get() + stamIncrease > this.staminaMax)
|
|
|
|
|
|
|
|
// this.stamina.compareAndSet(this.stamina.get(), this.staminaMax);
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// this.stamina.compareAndSet(this.stamina.get(), this.stamina.get() + stamIncrease);
|
|
|
|
|
|
|
|
// this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
|
|
|
|
|
|
|
|
// ChatManager.chatSystemInfo(this, "Healed 7 Stamina");
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//} else {
|
|
|
|
|
|
|
|
// this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!this.isAlive() && this.isEnteredWorld()) { |
|
|
|
//if (!this.isAlive() && this.isEnteredWorld()) {
|
|
|
|
if (!this.timestamps.containsKey("DeathTime")) { |
|
|
|
// if (!this.timestamps.containsKey("DeathTime")) {
|
|
|
|
this.timestamps.put("DeathTime", System.currentTimeMillis()); |
|
|
|
// this.timestamps.put("DeathTime", System.currentTimeMillis());
|
|
|
|
} else if ((System.currentTimeMillis() - this.timestamps.get("DeathTime")) > 600000) |
|
|
|
// } else if ((System.currentTimeMillis() - this.timestamps.get("DeathTime")) > 600000)
|
|
|
|
forceRespawn(this); |
|
|
|
// forceRespawn(this);
|
|
|
|
return; |
|
|
|
// return;
|
|
|
|
} |
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
if (this.isAlive() && this.isActive && this.enteredWorld) { |
|
|
|
if (this.isAlive() && this.isActive && this.enteredWorld) { |
|
|
|
|
|
|
|
|
|
|
|
this.updateMovementState(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.combatStats == null) { |
|
|
|
if (this.combatStats == null) { |
|
|
|
this.combatStats = new PlayerCombatStats(this); |
|
|
|
this.combatStats = new PlayerCombatStats(this); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|