From 773b6253b967732c420f0c19193da477b1a455b6 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sun, 2 Feb 2025 14:29:26 -0600
Subject: [PATCH] def formula

---
 src/engine/gameManager/SimulationManager.java | 13 +++++++------
 src/engine/objects/PlayerCharacter.java       | 17 ++---------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/engine/gameManager/SimulationManager.java b/src/engine/gameManager/SimulationManager.java
index da30fb74..fcb973e3 100644
--- a/src/engine/gameManager/SimulationManager.java
+++ b/src/engine/gameManager/SimulationManager.java
@@ -93,13 +93,10 @@ public enum SimulationManager {
         }
         try {
 
-            if ((_updatePulseTime != 0)
-                    && (System.currentTimeMillis() > _updatePulseTime))
+            if ((_updatePulseTime != 0) && (System.currentTimeMillis() > _updatePulseTime))
                 pulseUpdate();
         } catch (Exception e) {
-            Logger.error(
-                    "Fatal error in Update Pulse: DISABLED");
-            //  _runegatePulseTime = 0;
+            Logger.error("Fatal error in Update Pulse: DISABLED");
         }
 
         try {
@@ -160,7 +157,11 @@ public enum SimulationManager {
 
             if (player == null)
                 continue;
-            player.update(false);
+            try {
+                player.update(true);
+            }catch(Exception e){
+
+            }
         }
 
         _updatePulseTime = System.currentTimeMillis() + 500;
diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index 343ed807..ec96757f 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -5037,19 +5037,9 @@ public class PlayerCharacter extends AbstractCharacter {
     @Override
     public void update(Boolean newSystem) {
 
-        try {
-            ReentrantReadWriteLock reentrantLock = (ReentrantReadWriteLock) this.updateLock;
+        if(!newSystem)
+            return;
 
-            if(reentrantLock.writeLock().isHeldByCurrentThread()){
-                this.updateLock.writeLock().unlock();
-            }
-            // Check if the lock is currently held by another thread (either for reading or writing)
-            if (reentrantLock.isWriteLocked() || reentrantLock.getReadLockCount() > 0) {
-                return; // Or throw an exception if needed
-            }
-        }catch(Exception e){
-            //Logger.error(e);
-        }
         if (this.updateLock.writeLock().tryLock()) {
             try {
                 if (!this.isAlive() && this.isEnteredWorld()) {
@@ -5069,8 +5059,6 @@ public class PlayerCharacter extends AbstractCharacter {
                     } else {
                         this.combatStats.update();
                     }
-
-                    //this.doRegen();
                     this.doRegen();
                 }
 
@@ -5125,7 +5113,6 @@ public class PlayerCharacter extends AbstractCharacter {
                 }
 
             } catch (Exception e) {
-                this.updateLock.writeLock().unlock();
                 Logger.error(e);
             } finally {
                 this.updateLock.writeLock().unlock();