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

Adjust locks

Browse Source
This commit is contained in:
Sotr
2018-06-11 14:50:11 +08:00
parent b4da072470
commit 7bdc57cb70
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public class EntityTracker {
if (entity instanceof EntityPlayer) { if (entity instanceof EntityPlayer) {
this.addEntity(entity, 512, 2); this.addEntity(entity, 512, 2);
EntityPlayer entityplayer = (EntityPlayer) entity; EntityPlayer entityplayer = (EntityPlayer) entity;
entriesLock.writeLock().lock(); // Akarin entriesLock.readLock().lock(); // Akarin
Iterator iterator = this.c.iterator(); Iterator iterator = this.c.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -50,7 +50,7 @@ public class EntityTracker {
entitytrackerentry.updatePlayer(entityplayer); entitytrackerentry.updatePlayer(entityplayer);
} }
} }
entriesLock.writeLock().unlock(); // Akarin entriesLock.readLock().unlock(); // Akarin
} else if (entity instanceof EntityFishingHook) { } else if (entity instanceof EntityFishingHook) {
this.addEntity(entity, 64, 5, true); this.addEntity(entity, 64, 5, true);
} else if (entity instanceof EntityArrow) { } else if (entity instanceof EntityArrow) {
@@ -192,7 +192,7 @@ public class EntityTracker {
public void updatePlayers() { public void updatePlayers() {
ArrayList arraylist = Lists.newArrayList(); ArrayList arraylist = Lists.newArrayList();
entriesLock.writeLock().lock(); // Akarin entriesLock.readLock().lock(); // Akarin
Iterator iterator = this.c.iterator(); Iterator iterator = this.c.iterator();
world.timings.tracker1.startTiming(); // Spigot world.timings.tracker1.startTiming(); // Spigot
while (iterator.hasNext()) { 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.tracker1.stopTiming(); // Spigot
world.timings.tracker2.startTiming(); // Spigot world.timings.tracker2.startTiming(); // Spigot
@@ -228,7 +228,7 @@ public class EntityTracker {
} }
public void a(EntityPlayer entityplayer) { public void a(EntityPlayer entityplayer) {
entriesLock.writeLock().lock(); // Akarin entriesLock.readLock().lock(); // Akarin
Iterator iterator = this.c.iterator(); Iterator iterator = this.c.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -240,7 +240,7 @@ public class EntityTracker {
entitytrackerentry.updatePlayer(entityplayer); entitytrackerentry.updatePlayer(entityplayer);
} }
} }
entriesLock.writeLock().unlock(); // Akarin entriesLock.readLock().unlock(); // Akarin
} }
public void a(Entity entity, Packet<?> packet) { public void a(Entity entity, Packet<?> packet) {
@@ -262,7 +262,7 @@ public class EntityTracker {
} }
public void untrackPlayer(EntityPlayer entityplayer) { public void untrackPlayer(EntityPlayer entityplayer) {
entriesLock.writeLock().lock(); // Akarin entriesLock.readLock().lock(); // Akarin
Iterator iterator = this.c.iterator(); Iterator iterator = this.c.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -270,7 +270,7 @@ public class EntityTracker {
entitytrackerentry.clear(entityplayer); entitytrackerentry.clear(entityplayer);
} }
entriesLock.writeLock().unlock(); // Akarin entriesLock.readLock().unlock(); // Akarin
} }
public void a(EntityPlayer entityplayer, Chunk chunk) { public void a(EntityPlayer entityplayer, Chunk chunk) {