|
|
@ -5122,24 +5122,6 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
|
|
|
|
|
|
|
|
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()); |
|
|
@ -5147,26 +5129,6 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
forceRespawn(this); |
|
|
|
forceRespawn(this); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
//if(!this.timestamps.containsKey("stamTick")){
|
|
|
|
|
|
|
|
// this.timestamps.put("stamTick", System.currentTimeMillis());
|
|
|
|
|
|
|
|
//}else{
|
|
|
|
|
|
|
|
// if(this.containsEffect(441156479) || this.containsEffect(441156455)) {
|
|
|
|
|
|
|
|
// if(System.currentTimeMillis() - this.timestamps.get("stamTick") > 5000){
|
|
|
|
|
|
|
|
// boolean worked = false;
|
|
|
|
|
|
|
|
// while(!worked) {
|
|
|
|
|
|
|
|
// float old = this.stamina.get();
|
|
|
|
|
|
|
|
// float mod = old + 4;
|
|
|
|
|
|
|
|
// if (mod > this.staminaMax)
|
|
|
|
|
|
|
|
// mod = this.staminaMax;
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// worked = this.stamina.compareAndSet(old, mod);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// this.timestamps.put("stamTick", System.currentTimeMillis());
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }else{
|
|
|
|
|
|
|
|
// this.timestamps.put("stamTick", System.currentTimeMillis());
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.isAlive() && this.isActive && this.enteredWorld) { |
|
|
|
if (this.isAlive() && this.isActive && this.enteredWorld) { |
|
|
|
|
|
|
|
|
|
|
|