showfake: remove empty lists

DenizenScript · Jan 28, 2021 · 779ee76 · 779ee76
1 parent 1b52720
commit 779ee76
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/FakeBlock.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/FakeBlock.java
@@ -42,6 +42,9 @@ public void remove(FakeBlock block) {
                 List<FakeBlock> chunkBlocks = byChunk.get(block.chunkCoord);
                 if (chunkBlocks != null) {
                     chunkBlocks.remove(block);
+                    if (chunkBlocks.isEmpty()) {
+                        byChunk.remove(block.chunkCoord);
+                    }
                 }
             }
         }
@@ -124,6 +127,9 @@ public void cancelBlock() {
         }
         FakeBlockMap mapping = blocks.get(player.getUUID());
         mapping.remove(this);
+        if (mapping.byChunk.isEmpty()) {
+            blocks.remove(player.getUUID());
+        }
     }
 
     private void updateBlock(MaterialTag material, DurationTag duration) {

diff --git a/.../com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -616,7 +616,7 @@ public boolean processShowFakeForPacket(Packet<?> packet, GenericFutureListener<
                 int chunkZ = CHUNKZ_MAPCHUNK.getInt(packet);
                 ChunkCoordinate chunkCoord = new ChunkCoordinate(chunkX, chunkZ, player.getWorld().getWorld().getName());
                 List<FakeBlock> blocks = FakeBlock.getFakeBlocksFor(player.getUniqueID(), chunkCoord);
-                if (blocks == null) {
+                if (blocks == null || blocks.isEmpty()) {
                     return false;
                 }
                 PacketPlayOutMapChunk newPacket = FakeBlockHelper.handleMapChunkPacket((PacketPlayOutMapChunk) packet, blocks);