Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Threadsafe EntityTracker w/ cleanup

Browse Source
This commit is contained in:
Sotr
2018-08-02 01:00:34 +08:00
parent 2ba4bc2755
commit 05cc09ff51
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/src/main/java/net/minecraft/server/EntityTracker.java
View File

@@ -7,6 +7,9 @@ import com.googlecode.concurentlocks.ReentrantReadWriteUpdateLock;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.annotation.concurrent.ThreadSafe;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@@ -14,6 +17,7 @@ import org.apache.logging.log4j.Logger;
* Akarin Changes Note * Akarin Changes Note
* 1) Made collections and entry access thread-safe (safety issue) * 1) Made collections and entry access thread-safe (safety issue)
*/ */
@ThreadSafe // Akarin
public class EntityTracker { public class EntityTracker {
private static final Logger a = LogManager.getLogger(); private static final Logger a = LogManager.getLogger();
@@ -21,7 +25,7 @@ public class EntityTracker {
private final Set<EntityTrackerEntry> c = Sets.newHashSet(); private final Set<EntityTrackerEntry> c = Sets.newHashSet();
public final ReentrantReadWriteUpdateLock entriesLock = new ReentrantReadWriteUpdateLock(); // Akarin - add lock public final ReentrantReadWriteUpdateLock entriesLock = new ReentrantReadWriteUpdateLock(); // Akarin - add lock
public final IntHashMap<EntityTrackerEntry> trackedEntities = new IntHashMap(); public final IntHashMap<EntityTrackerEntry> trackedEntities = new IntHashMap();
private int e; private volatile int e; // Akarin - volatile
public EntityTracker(WorldServer worldserver) { public EntityTracker(WorldServer worldserver) {
this.world = worldserver; this.world = worldserver;

2
sources/src/main/java/net/minecraft/server/EntityTrackerEntry.java
View File

@@ -22,7 +22,7 @@ public class EntityTrackerEntry {
private static final Logger c = LogManager.getLogger(); private static final Logger c = LogManager.getLogger();
private final Entity tracker; private final Entity tracker;
private final int e; private final int e;
private volatile int f; // Akarin private volatile int f; // Akarin - volatile
private final int g; private final int g;
private long xLoc; private long xLoc;
private long yLoc; private long yLoc;

4
sources/src/main/java/net/minecraft/server/PlayerChunkMap.java
View File

@@ -503,12 +503,12 @@ public class PlayerChunkMap {
} }
public synchronized void a(PlayerChunk playerchunk) { // Akarin - synchronized public synchronized void a(PlayerChunk playerchunk) { // Akarin - synchronized
org.spigotmc.AsyncCatcher.catchOp("Async Player Chunk Add"); // Paper // Akarin // org.spigotmc.AsyncCatcher.catchOp("Async Player Chunk Add"); // Paper // Akarin
this.f.add(playerchunk); this.f.add(playerchunk);
} }
public synchronized void b(PlayerChunk playerchunk) { // Akarin - synchronized public synchronized void b(PlayerChunk playerchunk) { // Akarin - synchronized
// org.spigotmc.AsyncCatcher.catchOp("Async Player Chunk Remove"); // Paper // Akarin org.spigotmc.AsyncCatcher.catchOp("Async Player Chunk Remove"); // Paper
ChunkCoordIntPair chunkcoordintpair = playerchunk.a(); ChunkCoordIntPair chunkcoordintpair = playerchunk.a();
long i = d(chunkcoordintpair.x, chunkcoordintpair.z); long i = d(chunkcoordintpair.x, chunkcoordintpair.z);