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

targeting object checks only count when targeting players

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-11 07:44:28 -06:00
parent 3bc62e9baa
commit fe399664f3
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+17 -17
View File
@@ -5122,23 +5122,23 @@ public class PlayerCharacter extends AbstractCharacter {
if (this.updateLock.writeLock().tryLock()) { if (this.updateLock.writeLock().tryLock()) {
try { try {
if (!this.timestamps.contains("STAMHEALTICK")) { //if (!this.timestamps.contains("STAMHEALTICK")) {
this.timestamps.put("STAMHEALTICK", System.currentTimeMillis()); // this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
} //}
if (this.containsEffect(441156455)) { //if (this.containsEffect(441156455)) {
long length = System.currentTimeMillis() - this.timestamps.get("STAMHEALTICK"); // long length = System.currentTimeMillis() - this.timestamps.get("STAMHEALTICK").longValue();
if (length > 10000 ) { // if (length > 10000 ) {
float stamIncrease = 0.65f; // float stamIncrease = 6.5f;
if (this.stamina.get() + stamIncrease > this.staminaMax) // if (this.stamina.get() + stamIncrease > this.staminaMax)
this.stamina.compareAndSet(this.stamina.get(), this.staminaMax); // this.stamina.compareAndSet(this.stamina.get(), this.staminaMax);
else // else
this.stamina.compareAndSet(this.stamina.get(), this.stamina.get() + stamIncrease); // this.stamina.compareAndSet(this.stamina.get(), this.stamina.get() + stamIncrease);
this.timestamps.put("STAMHEALTICK", System.currentTimeMillis()); // this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
ChatManager.chatSystemInfo(this, "Healed 7 Stamina"); // ChatManager.chatSystemInfo(this, "Healed 7 Stamina");
} // }
} else { //} else {
this.timestamps.put("STAMHEALTICK", System.currentTimeMillis()); // 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")) {
src/engine/util/KeyCloneAudit.java
+4
View File
@@ -49,6 +49,10 @@ public enum KeyCloneAudit {
PlayerCharacter pc = SessionManager.getSession(origin).getPlayerCharacter(); PlayerCharacter pc = SessionManager.getSession(origin).getPlayerCharacter();
if (msg.getProtocolMsg().equals(Protocol.SETSELECTEDOBECT)) { if (msg.getProtocolMsg().equals(Protocol.SETSELECTEDOBECT)) {
TargetObjectMsg tarMsg = (TargetObjectMsg)msg;
if(tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
return;
if (System.currentTimeMillis() > origin.finalStrikeRefresh) { if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
origin.lastStrike = System.currentTimeMillis(); origin.lastStrike = System.currentTimeMillis();
origin.strikes = 0; origin.strikes = 0;