223 Zeilen
10 KiB
Diff
223 Zeilen
10 KiB
Diff
--- a/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -33,6 +33,16 @@
|
|
import javax.annotation.Nullable;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
+// CraftBukkit start
|
|
+import java.util.concurrent.CompletionException;
|
|
+import java.util.concurrent.ExecutionException;
|
|
+import java.util.concurrent.TimeUnit;
|
|
+import java.util.concurrent.TimeoutException;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.world.ChunkUnloadEvent;
|
|
+// CraftBukkit end
|
|
|
|
public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
|
|
|
@@ -179,9 +189,12 @@
|
|
|
|
return completablefuture1.thenApply((list1) -> {
|
|
List<IChunkAccess> list2 = Lists.newArrayList();
|
|
- final int l1 = 0;
|
|
+ // CraftBukkit start - decompile error
|
|
+ int cnt = 0;
|
|
|
|
- for (Iterator iterator = list1.iterator(); iterator.hasNext(); ++l1) {
|
|
+ for (Iterator iterator = list1.iterator(); iterator.hasNext(); ++cnt) {
|
|
+ final int l1 = cnt;
|
|
+ // CraftBukkit end
|
|
final Either<IChunkAccess, PlayerChunk.Failure> either = (Either) iterator.next();
|
|
Optional<IChunkAccess> optional = either.left();
|
|
|
|
@@ -257,9 +270,9 @@
|
|
}).forEach((completablefuture) -> {
|
|
if (flag) {
|
|
this.executor.awaitTasks(completablefuture::isDone);
|
|
- ((Either) completablefuture.join()).ifLeft(this::saveChunk);
|
|
+ (completablefuture.join()).ifLeft(this::saveChunk); // CraftBukkit - decompile error
|
|
} else {
|
|
- ((Either) completablefuture.getNow(PlayerChunk.UNLOADED_CHUNK_ACCESS)).ifLeft(this::saveChunk);
|
|
+ (completablefuture.getNow(PlayerChunk.UNLOADED_CHUNK_ACCESS)).ifLeft(this::saveChunk); // CraftBukkit - decompile error
|
|
}
|
|
|
|
});
|
|
@@ -280,13 +293,34 @@
|
|
|
|
for (int i = 0; longiterator.hasNext() && (booleansupplier.getAsBoolean() || i < 200 || this.unloadQueue.size() > 2000); longiterator.remove()) {
|
|
long j = longiterator.nextLong();
|
|
- PlayerChunk playerchunk = (PlayerChunk) this.updatingChunks.remove(j);
|
|
+ PlayerChunk playerchunk = (PlayerChunk) this.updatingChunks.get(j); // CraftBukkit
|
|
|
|
if (playerchunk != null) {
|
|
+ // CraftBukkit start
|
|
+ ChunkUnloadEvent event = null;
|
|
+ IChunkAccess access = null;
|
|
+ try {
|
|
+ access = playerchunk.getChunkSave().get(5, TimeUnit.SECONDS);
|
|
+ } catch (ExecutionException ex) {
|
|
+ throw new CompletionException(ex);
|
|
+ } catch (InterruptedException | TimeoutException ex) {
|
|
+ System.err.println("Failed to save chunk " + playerchunk + " " + playerchunk.getChunkSave());
|
|
+ }
|
|
+
|
|
+ if (access instanceof Chunk) {
|
|
+ event = new ChunkUnloadEvent(((Chunk) access).bukkitChunk, access.isNeedsSaving());
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ this.updatingChunks.remove(j);
|
|
+ // CraftBukkit end
|
|
this.g.put(j, playerchunk);
|
|
this.updatingChunksModified = true;
|
|
++i;
|
|
- this.a(j, playerchunk);
|
|
+ this.a(j, playerchunk, event); // CraftBukkit
|
|
}
|
|
}
|
|
}
|
|
@@ -294,17 +328,23 @@
|
|
gameprofilerfiller.exit();
|
|
}
|
|
|
|
- private void a(long i, PlayerChunk playerchunk) {
|
|
+ private void a(long i, PlayerChunk playerchunk, ChunkUnloadEvent event) { // CraftBukkit - add event
|
|
CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkSave();
|
|
|
|
completablefuture.thenAcceptAsync((ichunkaccess) -> {
|
|
CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkSave();
|
|
|
|
if (completablefuture1 != completablefuture) {
|
|
- this.a(i, playerchunk);
|
|
+ this.a(i, playerchunk, event); // CraftBukkit
|
|
} else {
|
|
if (this.g.remove(i, playerchunk) && ichunkaccess != null) {
|
|
- this.saveChunk(ichunkaccess);
|
|
+ // CraftBukkit start
|
|
+ if (event == null) {
|
|
+ this.saveChunk(ichunkaccess);
|
|
+ } else {
|
|
+ this.saveChunk(ichunkaccess, event.isSaveChunk());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (this.h.remove(i) && ichunkaccess instanceof Chunk) {
|
|
Chunk chunk = (Chunk) ichunkaccess;
|
|
|
|
@@ -394,7 +434,7 @@
|
|
return CompletableFuture.completedFuture(Either.right(playerchunk_failure));
|
|
});
|
|
}, (runnable) -> {
|
|
- this.mailboxWorldGen.a((Object) ChunkTaskQueueSorter.a(playerchunk, runnable));
|
|
+ this.mailboxWorldGen.a(ChunkTaskQueueSorter.a(playerchunk, runnable)); // CraftBukkit - decompile error
|
|
});
|
|
}
|
|
}
|
|
@@ -454,7 +494,10 @@
|
|
while (iterator.hasNext()) {
|
|
Entity entity = (Entity) iterator.next();
|
|
|
|
- if (!(entity instanceof EntityHuman) && !this.world.addEntityChunk(entity)) {
|
|
+ // CraftBukkit start
|
|
+ boolean addEntity = !chunk.needsDecoration || CraftEventFactory.doEntityAddEventCalling(this.world, entity, CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // Only call for new chunks
|
|
+ if (addEntity && !(entity instanceof EntityHuman) && !this.world.addEntityChunk(entity)) {
|
|
+ // CraftBukkit end
|
|
if (list == null) {
|
|
list = Lists.newArrayList(new Entity[] { entity});
|
|
} else {
|
|
@@ -476,7 +519,7 @@
|
|
long i = playerchunk.h().pair();
|
|
|
|
playerchunk.getClass();
|
|
- mailbox.a((Object) ChunkTaskQueueSorter.a(runnable, i, playerchunk::i));
|
|
+ mailbox.a(ChunkTaskQueueSorter.a(runnable, i, playerchunk::i)); // CraftBukkit - decompile error
|
|
});
|
|
}
|
|
|
|
@@ -493,7 +536,7 @@
|
|
return Either.left(chunk);
|
|
});
|
|
}, (runnable) -> {
|
|
- this.mailboxMain.a((Object) ChunkTaskQueueSorter.a(playerchunk, runnable));
|
|
+ this.mailboxMain.a(ChunkTaskQueueSorter.a(playerchunk, runnable)); // CraftBukkit - decompile error
|
|
});
|
|
|
|
completablefuture1.thenAcceptAsync((either) -> {
|
|
@@ -507,7 +550,7 @@
|
|
return Either.left(chunk);
|
|
});
|
|
}, (runnable) -> {
|
|
- this.mailboxMain.a((Object) ChunkTaskQueueSorter.a(playerchunk, runnable));
|
|
+ this.mailboxMain.a(ChunkTaskQueueSorter.a(playerchunk, runnable)); // CraftBukkit - decompile error
|
|
});
|
|
return completablefuture1;
|
|
}
|
|
@@ -517,8 +560,14 @@
|
|
}
|
|
|
|
public void saveChunk(IChunkAccess ichunkaccess) {
|
|
+ // CraftBukkit start
|
|
+ this.saveChunk(ichunkaccess, ichunkaccess.isNeedsSaving());
|
|
+ }
|
|
+
|
|
+ public void saveChunk(IChunkAccess ichunkaccess, boolean save) {
|
|
+ // CraftBukkit end
|
|
this.n.a(ichunkaccess.getPos());
|
|
- if (ichunkaccess.isNeedsSaving()) {
|
|
+ if (save) { // CraftBukkit
|
|
try {
|
|
this.world.checkSession();
|
|
} catch (ExceptionWorldConflict exceptionworldconflict) {
|
|
@@ -569,9 +618,10 @@
|
|
ChunkCoordIntPair chunkcoordintpair = playerchunk.h();
|
|
Packet<?>[] apacket = new Packet[2];
|
|
|
|
+ int finall = l; // CraftBukkit - decompile error
|
|
this.a(chunkcoordintpair, false).forEach((entityplayer) -> {
|
|
int i1 = b(chunkcoordintpair, entityplayer, true);
|
|
- boolean flag = i1 <= l;
|
|
+ boolean flag = i1 <= finall; // CraftBukkit - decompile error
|
|
boolean flag1 = i1 <= this.A;
|
|
|
|
this.sendChunk(entityplayer, chunkcoordintpair, apacket, flag, flag1);
|
|
@@ -626,7 +676,7 @@
|
|
private NBTTagCompound f(ChunkCoordIntPair chunkcoordintpair) throws IOException {
|
|
NBTTagCompound nbttagcompound = this.read(chunkcoordintpair);
|
|
|
|
- return nbttagcompound == null ? null : this.getChunkData(this.world.getWorldProvider().getDimensionManager(), this.m, nbttagcompound);
|
|
+ return nbttagcompound == null ? null : this.getChunkData(this.world.getWorldProvider().getDimensionManager(), this.m, nbttagcompound, chunkcoordintpair, world); // CraftBukkit
|
|
}
|
|
|
|
boolean d(ChunkCoordIntPair chunkcoordintpair) {
|
|
@@ -946,7 +996,7 @@
|
|
public final Set<EntityPlayer> trackedPlayers = Sets.newHashSet();
|
|
|
|
public EntityTracker(Entity entity, int i, int j, boolean flag) {
|
|
- this.trackerEntry = new EntityTrackerEntry(PlayerChunkMap.this.world, entity, j, flag, this::broadcast);
|
|
+ this.trackerEntry = new EntityTrackerEntry(PlayerChunkMap.this.world, entity, j, flag, this::broadcast, trackedPlayers); // CraftBukkit
|
|
this.tracker = entity;
|
|
this.trackingDistance = i;
|
|
this.e = SectionPosition.a(entity);
|
|
@@ -1015,6 +1065,17 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start - respect vanish API
|
|
+ if (this.tracker instanceof EntityPlayer) {
|
|
+ Player player = ((EntityPlayer) this.tracker).getBukkitEntity();
|
|
+ if (!entityplayer.getBukkitEntity().canSee(player)) {
|
|
+ flag1 = false;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId()));
|
|
+ // CraftBukkit end
|
|
+
|
|
if (flag1 && this.trackedPlayers.add(entityplayer)) {
|
|
this.trackerEntry.b(entityplayer);
|
|
}
|