Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Lock for dirtyload integration.

Browse Source
This commit is contained in:
MagicBot
2023-08-21 04:40:11 -04:00
parent 14968dbb3b
commit 9072fc2788
2 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/InterestManager.java
+9 -29
View File
@@ -236,7 +236,7 @@ public enum InterestManager implements Runnable {
if (distanceSquared > sqr(25))
player.setLastStaticLoc(player.getLoc());
else if (player.dirtyLoad.get() == false)
else if (player.isDirtyLoad() == false)
return;
// Get Statics in range
@@ -314,7 +314,7 @@ public enum InterestManager implements Runnable {
}
loadedStaticObjects.addAll(toLoad);
player.dirtyLoad.set(false);
player.setDirtyLoad(false);
}
private void updateMobileList(PlayerCharacter player, ClientConnection origin) {
@@ -519,22 +519,12 @@ public enum InterestManager implements Runnable {
if (origin == null)
return;
//Update static list
// Update loaded upbjects lists
try {
player.dirtyLoad.set(true);
player.setDirtyLoad(true);
updateStaticList(player, origin);
} catch (Exception e) {
Logger.error("InterestManager.updateAllStaticPlayers: " + player.getObjectUUID(), e);
}
//Update mobile list
try {
updateMobileList(player, origin);
} catch (Exception e) {
Logger.error("InterestManager.updateAllMobilePlayers: " + player.getObjectUUID(), e);
}
}
public synchronized void HandleLoadForTeleport(PlayerCharacter playerCharacter) {
@@ -547,22 +537,12 @@ public enum InterestManager implements Runnable {
if (origin == null)
return;
//Update static list
// Update loaded upbjects lists
try {
playerCharacter.dirtyLoad.set(true);
playerCharacter.setDirtyLoad(true);
updateStaticList(playerCharacter, origin);
} catch (Exception e) {
Logger.error("InterestManager.updateAllStaticPlayers: " + playerCharacter.getObjectUUID(), e);
}
//Update mobile list
try {
updateMobileList(playerCharacter, origin);
} catch (Exception e) {
Logger.error("InterestManager.updateAllMobilePlayers: " + playerCharacter.getObjectUUID(), e);
}
}
public static void setObjectDirty(AbstractWorldObject abstractWorldObject) {
@@ -575,7 +555,7 @@ public enum InterestManager implements Runnable {
for (AbstractWorldObject playerObject : playerList) {
PlayerCharacter playerCharacter = (PlayerCharacter) playerObject;
playerCharacter.dirtyLoad.set(true);
playerCharacter.setDirtyLoad(true);
}
}
}
src/engine/objects/PlayerCharacter.java
+16 -2
View File
@@ -49,7 +49,6 @@ import java.sql.SQLException;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -173,7 +172,8 @@ public class PlayerCharacter extends AbstractCharacter {
private float characterHeight = 0;
private boolean lastSwimming = false;
private boolean isTeleporting = false;
public AtomicBoolean dirtyLoad = new AtomicBoolean(true);
private boolean dirtyLoad = true;
private final ReadWriteLock dirtyLock = new ReentrantReadWriteLock(true);
/**
* No Id Constructor
@@ -5512,4 +5512,18 @@ public class PlayerCharacter extends AbstractCharacter {
return bargain;
}
public boolean isDirtyLoad() {
boolean dirtyValue;
dirtyLock.readLock().lock();
dirtyValue = dirtyLoad;
dirtyLock.readLock().unlock();
return dirtyValue;
}
public void setDirtyLoad(boolean dirtyLoad) {
dirtyLock.writeLock().lock();
this.dirtyLoad = dirtyLoad;
dirtyLock.writeLock().unlock();
}
}