From 7bdc57cb709d3b30398c7a691e7480e9278cf98c Mon Sep 17 00:00:00 2001 From: Sotr Date: Mon, 11 Jun 2018 14:50:11 +0800 Subject: [PATCH] Adjust locks --- .../java/net/minecraft/server/EntityTracker.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/src/main/java/net/minecraft/server/EntityTracker.java b/sources/src/main/java/net/minecraft/server/EntityTracker.java index ad48af80b..461d4b303 100644 --- a/sources/src/main/java/net/minecraft/server/EntityTracker.java +++ b/sources/src/main/java/net/minecraft/server/EntityTracker.java @@ -40,7 +40,7 @@ public class EntityTracker { if (entity instanceof EntityPlayer) { this.addEntity(entity, 512, 2); EntityPlayer entityplayer = (EntityPlayer) entity; - entriesLock.writeLock().lock(); // Akarin + entriesLock.readLock().lock(); // Akarin Iterator iterator = this.c.iterator(); while (iterator.hasNext()) { @@ -50,7 +50,7 @@ public class EntityTracker { entitytrackerentry.updatePlayer(entityplayer); } } - entriesLock.writeLock().unlock(); // Akarin + entriesLock.readLock().unlock(); // Akarin } else if (entity instanceof EntityFishingHook) { this.addEntity(entity, 64, 5, true); } else if (entity instanceof EntityArrow) { @@ -192,7 +192,7 @@ public class EntityTracker { public void updatePlayers() { ArrayList arraylist = Lists.newArrayList(); - entriesLock.writeLock().lock(); // Akarin + entriesLock.readLock().lock(); // Akarin Iterator iterator = this.c.iterator(); world.timings.tracker1.startTiming(); // Spigot while (iterator.hasNext()) { @@ -207,7 +207,7 @@ public class EntityTracker { } } } - entriesLock.writeLock().unlock(); // Akarin + entriesLock.readLock().unlock(); // Akarin world.timings.tracker1.stopTiming(); // Spigot world.timings.tracker2.startTiming(); // Spigot @@ -228,7 +228,7 @@ public class EntityTracker { } public void a(EntityPlayer entityplayer) { - entriesLock.writeLock().lock(); // Akarin + entriesLock.readLock().lock(); // Akarin Iterator iterator = this.c.iterator(); while (iterator.hasNext()) { @@ -240,7 +240,7 @@ public class EntityTracker { entitytrackerentry.updatePlayer(entityplayer); } } - entriesLock.writeLock().unlock(); // Akarin + entriesLock.readLock().unlock(); // Akarin } public void a(Entity entity, Packet packet) { @@ -262,7 +262,7 @@ public class EntityTracker { } public void untrackPlayer(EntityPlayer entityplayer) { - entriesLock.writeLock().lock(); // Akarin + entriesLock.readLock().lock(); // Akarin Iterator iterator = this.c.iterator(); while (iterator.hasNext()) { @@ -270,7 +270,7 @@ public class EntityTracker { entitytrackerentry.clear(entityplayer); } - entriesLock.writeLock().unlock(); // Akarin + entriesLock.readLock().unlock(); // Akarin } public void a(EntityPlayer entityplayer, Chunk chunk) {