MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

new Regen

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-13 21:06:27 -06:00
parent e9f1711120
commit 6834146eb2
2 changed files with 160 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+22 -21
View File
@@ -5147,26 +5147,26 @@ public class PlayerCharacter extends AbstractCharacter {
forceRespawn(this);
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.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) {
@@ -5177,7 +5177,8 @@ public class PlayerCharacter extends AbstractCharacter {
} else {
this.combatStats.update();
}
this.doRegen();
//this.doRegen();
this.combatStats.regenerate();
}
if (this.getStamina() < 10) {