coldsore
/
Server
forked from MagicBane/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

disable force DC

lakebane-mobAI
FatBoy-DOTC 8 months ago
parent
8e5aec841d
commit
f28b15b95e
1 changed files with 11 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      src/engine/objects/PlayerCharacter.java

42
src/engine/objects/PlayerCharacter.java
Unescape View File

@ -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 {

Write Preview
Loading…
Cancel
Save