From e4a3405032b77178fa3766bf2ee23608b92b6ec2 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Mon, 3 Feb 2025 19:02:34 -0600 Subject: [PATCH] location sync and def formula --- src/engine/objects/PlayerCharacter.java | 6 +++++- src/engine/objects/PlayerCombatStats.java | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index f108beeb..7362ab00 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -5112,8 +5112,12 @@ public class PlayerCharacter extends AbstractCharacter { @Override public void update(Boolean newSystem) { + this.updateLocation(); + this.updateMovementState(); + if(!newSystem) return; + try { if (this.updateLock.writeLock().tryLock()) { @@ -5125,7 +5129,7 @@ public class PlayerCharacter extends AbstractCharacter { forceRespawn(this); return; } - this.updateLocation(); + if (this.isAlive() && this.isActive && this.enteredWorld) { this.updateMovementState(); diff --git a/src/engine/objects/PlayerCombatStats.java b/src/engine/objects/PlayerCombatStats.java index ea7d8581..7e587fa9 100644 --- a/src/engine/objects/PlayerCombatStats.java +++ b/src/engine/objects/PlayerCombatStats.java @@ -532,7 +532,7 @@ public class PlayerCombatStats { } for(String armorUsed : armorsUsed){ if(this.owner.skills.containsKey(armorUsed)) { - armorSkill += this.owner.skills.get(armorUsed).getModifiedAmount();//calculateBuffedSkillLevel(armorUsed,this.owner); + armorSkill += this.owner.skills.get(armorUsed).getTotalSkillPercet();//calculateBuffedSkillLevel(armorUsed,this.owner); } } if(armorsUsed.size() > 0) @@ -572,10 +572,10 @@ public class PlayerCombatStats { masteryName = weapon.getItemBase().getMastery(); } if(this.owner.skills.containsKey(skillName)) - weaponSkill = this.owner.skills.get(skillName).getModifiedAmount();//calculateBuffedSkillLevel(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount();//calculateModifiedSkill(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount(); + weaponSkill = this.owner.skills.get(skillName).getTotalSkillPercet();//calculateBuffedSkillLevel(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount();//calculateModifiedSkill(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount(); if(this.owner.skills.containsKey(masteryName)) - masterySkill = this.owner.skills.get(masteryName).getModifiedAmount();//calculateBuffedSkillLevel(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount();//calculateModifiedSkill(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount(); + masterySkill = this.owner.skills.get(masteryName).getTotalSkillPercet();//calculateBuffedSkillLevel(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount();//calculateModifiedSkill(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount(); float dexterity = getDexAfterPenalty(this.owner);