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

Threadsafe is needed for the flag.

Browse Source
This commit is contained in:
MagicBot
2023-08-20 20:37:24 -04:00
parent 50e962b77e
commit 621d78172d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/InterestManager.java
+5 -5
View File
@@ -236,7 +236,7 @@ public enum InterestManager implements Runnable {
if (distanceSquared > sqr(25)) if (distanceSquared > sqr(25))
player.setLastStaticLoc(player.getLoc()); player.setLastStaticLoc(player.getLoc());
else if (player.dirtyLoad == false) else if (player.dirtyLoad.get() == false)
return; return;
// Get Statics in range // Get Statics in range
@@ -314,7 +314,7 @@ public enum InterestManager implements Runnable {
} }
loadedStaticObjects.addAll(toLoad); loadedStaticObjects.addAll(toLoad);
player.dirtyLoad = false; player.dirtyLoad.set(false);
} }
private void updateMobileList(PlayerCharacter player, ClientConnection origin) { private void updateMobileList(PlayerCharacter player, ClientConnection origin) {
@@ -522,7 +522,7 @@ public enum InterestManager implements Runnable {
//Update static list //Update static list
try { try {
player.dirtyLoad = true; player.dirtyLoad.set(true);
updateStaticList(player, origin); updateStaticList(player, origin);
} catch (Exception e) { } catch (Exception e) {
Logger.error("InterestManager.updateAllStaticPlayers: " + player.getObjectUUID(), e); Logger.error("InterestManager.updateAllStaticPlayers: " + player.getObjectUUID(), e);
@@ -550,7 +550,7 @@ public enum InterestManager implements Runnable {
//Update static list //Update static list
try { try {
playerCharacter.dirtyLoad = true; playerCharacter.dirtyLoad.set(true);
updateStaticList(playerCharacter, origin); updateStaticList(playerCharacter, origin);
} catch (Exception e) { } catch (Exception e) {
Logger.error("InterestManager.updateAllStaticPlayers: " + playerCharacter.getObjectUUID(), e); Logger.error("InterestManager.updateAllStaticPlayers: " + playerCharacter.getObjectUUID(), e);
@@ -575,7 +575,7 @@ public enum InterestManager implements Runnable {
for (AbstractWorldObject playerObject : playerList) { for (AbstractWorldObject playerObject : playerList) {
PlayerCharacter playerCharacter = (PlayerCharacter) playerObject; PlayerCharacter playerCharacter = (PlayerCharacter) playerObject;
playerCharacter.dirtyLoad = true; playerCharacter.dirtyLoad.set(true);
} }
} }
} }
src/engine/objects/PlayerCharacter.java
+2 -1
View File
@@ -49,6 +49,7 @@ import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -180,7 +181,7 @@ public class PlayerCharacter extends AbstractCharacter {
private float characterHeight = 0; private float characterHeight = 0;
private boolean lastSwimming = false; private boolean lastSwimming = false;
private boolean isTeleporting = false; private boolean isTeleporting = false;
public boolean dirtyLoad = true; public AtomicBoolean dirtyLoad = new AtomicBoolean(true);
/** /**
* No Id Constructor * No Id Constructor