Spigot / CraftBukkit / 1953f52da1e

Commits

Aikar authored and md_5 committed 1953f52da1e 21 Jun 2016

SPIGOT-2439: Consistently fire Chunk(Load|Unload)Event

Clean up implementation and firing of both of these events by routing
both unload and load behaviors to consistent method calls.

This fixes issues where a few places would not call Load or Unload events
when it should have.

Additionally, reduces diff by moving the neighbor marking code into these
consistent points.

Additional benefits of the change include improving the neighbor marking
methods to use getChunkIfLoaded instead of getLoadedChunkAt in some places,
as the latter will cause chunks to be marked active and not unload.

Finally, this also updates CraftWorld.loadChunk to use the new methods, as the
previous logic did not properly handle the new unload queue.

nms-patches/Chunk.patch

Modified

-1
+--- a/net/minecraft/server/Chunk.java
-2
++++ b/net/minecraft/server/Chunk.java
-3
+@@ -14,6 +14,9 @@
-4
+ import org.apache.logging.log4j.LogManager;
-5
+ import org.apache.logging.log4j.Logger;
-6
-7
++import com.google.common.collect.Lists; // CraftBukkit
--
++import org.bukkit.Bukkit; // CraftBukkit
-+
++import org.bukkit.Server; // CraftBukkit
-9
++
-10
+ public class Chunk {
-11
-12
+     private static final Logger e = LogManager.getLogger();
--
+@@ -42,6 +45,34 @@
-+
+@@ -42,6 +45,35 @@
-14
+     private ConcurrentLinkedQueue<BlockPosition> y;
-15
+     public boolean d;
-16
-17
++    // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
-18
++    private int neighbors = 0x1 << 12;
-+
++    public long chunkKey;
-20
++
-21
++    public boolean areNeighborsLoaded(final int radius) {
-22
++        switch (radius) {
-23
++            case 2:
-24
++                return this.neighbors == Integer.MAX_VALUE >> 6;
-25
++            case 1:
-26
++                final int mask =
-27
++                        //       x        z   offset          x        z   offset          x         z   offset
-28
++                        (0x1 << (1 * 5 +  1 + 12)) | (0x1 << (0 * 5 +  1 + 12)) | (0x1 << (-1 * 5 +  1 + 12)) |
-29
++                        (0x1 << (1 * 5 +  0 + 12)) | (0x1 << (0 * 5 +  0 + 12)) | (0x1 << (-1 * 5 +  0 + 12)) |
-39
++    }
-40
++
-41
++    public void setNeighborUnloaded(final int x, final int z) {
-42
++        this.neighbors &= ~(0x1 << (x * 5 + 12 + z));
-43
++    }
-44
++    // CraftBukkit end
-45
++
-46
+     public Chunk(World world, int i, int j) {
-47
+         this.sections = new ChunkSection[16];
-48
+         this.g = new byte[256];
--
+@@ -62,8 +93,14 @@
-+
+@@ -62,8 +94,15 @@
-50
-51
+         Arrays.fill(this.h, -999);
-52
+         Arrays.fill(this.g, (byte) -1);
-53
++        // CraftBukkit start
-54
++        this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this);
-+
++        this.chunkKey = ChunkCoordIntPair.a(this.locX, this.locZ);
-56
+     }
-57
-58
++    public org.bukkit.Chunk bukkitChunk;
-59
++    public boolean mustSave;
-60
++    // CraftBukkit end
-61
++
-62
+     public Chunk(World world, ChunkSnapshot chunksnapshot, int i, int j) {
-63
+         this(world, i, j);
-64
+         boolean flag = true;
--
+@@ -467,7 +504,8 @@
-+
+@@ -467,7 +506,8 @@
-66
+                     }
-67
+                 }
-68
-69
+-                if (!this.world.isClientSide && block1 != block) {
-70
++                // CraftBukkit - Don't place while processing the BlockPlaceEvent, unless it's a BlockContainer. Prevents blocks such as TNT from activating when cancelled.
-71
++                if (!this.world.isClientSide && block1 != block  && (!this.world.captureBlockStates || block instanceof BlockTileEntity)) {
-72
+                     block.onPlace(this.world, blockposition, iblockdata);
-73
+                 }
-74
--
+@@ -604,7 +642,15 @@
-+
+@@ -604,7 +644,15 @@
-76
-77
+     @Nullable
-78
+     public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
-79
+-        TileEntity tileentity = (TileEntity) this.tileEntities.get(blockposition);
-80
++        // CraftBukkit start
-81
++        TileEntity tileentity = null;
-82
++        if (world.captureBlockStates) {
-83
++            tileentity = world.capturedTileEntities.get(blockposition);
-84
++        }
-85
++        if (tileentity == null) {
-86
++            tileentity = (TileEntity) this.tileEntities.get(blockposition);
-87
++        }
-88
++        // CraftBukkit end
-89
-90
+         if (tileentity == null) {
-91
+             if (chunk_enumtileentitystate == Chunk.EnumTileEntityState.IMMEDIATE) {
--
+@@ -639,6 +685,13 @@
-+
+@@ -639,6 +687,13 @@
-93
-94
+             tileentity.z();
-95
+             this.tileEntities.put(blockposition, tileentity);
-96
++            // CraftBukkit start
-97
++        } else {
-98
++            System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
-99
++                + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
-100
++            System.out.println("Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16));
-101
++            new Exception().printStackTrace();
-102
++            // CraftBukkit end
-103
+         }
-104
+     }
-105
--
+@@ -681,9 +734,21 @@
-+
+@@ -681,9 +736,21 @@
-107
+         int i = aentityslice.length;
-108
-109
+         for (int j = 0; j < i; ++j) {
-110
+-            EntitySlice entityslice = aentityslice[j];
-111
++            // CraftBukkit start
-112
++            List<Entity> newList = Lists.newArrayList(aentityslice[j]);
-113
++            java.util.Iterator<Entity> iter = newList.iterator();
-114
++            while (iter.hasNext()) {
-115
++                Entity entity = iter.next();
--
--
+-            this.world.c((Collection) entityslice);
 +
-117
++                // Do not pass along players, as doing so can get them stuck outside of time.
-118
++                // (which for example disables inventory icon updates and prevents block breaking)
-119
++                if (entity instanceof EntityPlayer) {
-120
++                    iter.remove();
-121
++                }
-122
++            }
--
++
--
++            this.world.c((Collection) newList);
-+
-+
+-            this.world.c((Collection) entityslice);
-+
++            this.world.c(newList);
-126
++            // CraftBukkit end
-127
+         }
-128
-129
+     }
--
+@@ -745,8 +810,8 @@
-+
+@@ -745,8 +812,8 @@
-131
+             while (iterator.hasNext()) {
-132
+                 Entity entity = (Entity) iterator.next();
-133
-134
+-                if (entity.getBoundingBox().b(axisalignedbb) && (predicate == null || predicate.apply(entity))) {
-135
+-                    list.add(entity);
-136
++                if (entity.getBoundingBox().b(axisalignedbb) && (predicate == null || predicate.apply((T) entity))) { // CraftBukkit - fix decompile error
-137
++                    list.add((T) entity); // Fix decompile error
-138
+                 }
-139
+             }
-140
+         }
--
+@@ -809,6 +874,29 @@
-+
+@@ -773,7 +840,34 @@
-+
+         return false;
-+
+     }
-+
-+
+-    public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator) {
-+
++    // CraftBukkit start
-+
++    public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator, boolean newChunk) {
-+
++        Server server = world.getServer();
-+
++        if (server != null) {
-+
++            /*
-+
++             * If it's a new world, the first few chunks are generated inside
-+
++             * the World constructor. We can't reliably alter that, so we have
-+
++             * no way of creating a CraftWorld/CraftServer at that point.
-+
++             */
-+
++            server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(bukkitChunk, newChunk));
-+
++        }
 +
-+
++        // Update neighbor counts
-+
++        for (int x = -2; x < 3; x++) {
-+
++            for (int z = -2; z < 3; z++) {
-+
++                if (x == 0 && z == 0) {
-+
++                    continue;
-+
++                }
 +
-+
++                Chunk neighbor = getWorld().getChunkIfLoaded(locX + x, locZ + z);
-+
++                if (neighbor != null) {
-+
++                    neighbor.setNeighborLoaded(-x, -z);
-+
++                    setNeighborLoaded(x, z);
-+
++                }
-+
++            }
-+
++        }
-+
++        // CraftBukkit end
 +
-+
+         Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
-+
+         Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
-+
+         Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
-+
+@@ -809,6 +903,29 @@
-178
+         } else {
-179
+             this.o();
-180
+             chunkgenerator.recreateStructures(this.locX, this.locZ);
-181
++
-182
++            // CraftBukkit start
-183
++            BlockSand.instaFall = true;
-184
++            Random random = new Random();
-185
++            random.setSeed(world.getSeed());
-186
++            long xRand = random.nextLong() / 2L * 2L + 1L;
-187
++            long zRand = random.nextLong() / 2L * 2L + 1L;

CraftBukkit

Commits

Jira Issues

Add shortcut