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

targeting object checks only count when targeting players

lakebane-ai
FatBoy-DOTC 9 months ago
parent
3bc62e9baa
commit
fe399664f3
2 changed files with 21 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      src/engine/objects/PlayerCharacter.java
  2. 4
      src/engine/util/KeyCloneAudit.java

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

@ -5122,23 +5122,23 @@ public class PlayerCharacter extends AbstractCharacter { @@ -5122,23 +5122,23 @@ public class PlayerCharacter extends AbstractCharacter {
if (this.updateLock.writeLock().tryLock()) {
try {
if (!this.timestamps.contains("STAMHEALTICK")) {
this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
}
if (this.containsEffect(441156455)) {
long length = System.currentTimeMillis() - this.timestamps.get("STAMHEALTICK");
if (length > 10000 ) {
float stamIncrease = 0.65f;
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.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.timestamps.containsKey("DeathTime")) {

4
src/engine/util/KeyCloneAudit.java
Unescape View File

@ -49,6 +49,10 @@ public enum KeyCloneAudit { @@ -49,6 +49,10 @@ public enum KeyCloneAudit {
PlayerCharacter pc = SessionManager.getSession(origin).getPlayerCharacter();
if (msg.getProtocolMsg().equals(Protocol.SETSELECTEDOBECT)) {
TargetObjectMsg tarMsg = (TargetObjectMsg)msg;
if(tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
return;
if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
origin.lastStrike = System.currentTimeMillis();
origin.strikes = 0;

Write Preview
Loading…
Cancel
Save