Remove predictions of invalidated blocks

Author: valaphee

core/src/main/java/org/geysermc/geyser/session/cache/WorldCache.java

@@ -180,9 +180,7 @@ public void markPositionInSequence(Vector3i position) {
     }
 
     public void updateServerCorrectBlockState(Vector3i position, int blockState) {
-        if (!this.unverifiedPredictions.isEmpty()) {
-            this.unverifiedPredictions.removeInt(position);
-        }
+        this.unverifiedPredictions.removeInt(position);
 
         // Hack to avoid looking up blockstates for the currently broken position each tick
         Vector3i clientBreakPos = session.getBlockBreakHandler().getCurrentBlockPos();
@@ -193,11 +191,11 @@ public void updateServerCorrectBlockState(Vector3i position, int blockState) {
         ChunkUtils.updateBlock(session, blockState, position);
     }
 
-    public void endPredictionsUpTo(int sequence) {
-        if (this.unverifiedPredictions.isEmpty()) {
-            return;
-        }
+    public void removePrediction(Vector3i position) {
+        this.unverifiedPredictions.removeInt(position);
+    }
 
+    public void endPredictionsUpTo(int sequence) {
         Iterator<Object2IntMap.Entry<Vector3i>> it = Object2IntMaps.fastIterator(this.unverifiedPredictions);
         while (it.hasNext()) {
             Object2IntMap.Entry<Vector3i> entry = it.next();

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeBookAddTranslator.java

@@ -47,7 +47,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Translator(packet = ClientboundRecipeBookAddPacket.class)
+//@Translator(packet = ClientboundRecipeBookAddPacket.class)
 public class JavaRecipeBookAddTranslator extends PacketTranslator<ClientboundRecipeBookAddPacket> {
 
     @Override

core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaSectionBlocksUpdateTranslator.java

@@ -38,6 +38,8 @@
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
 
+import java.util.BitSet;
+
 @Translator(packet = ClientboundSectionBlocksUpdatePacket.class)
 public class JavaSectionBlocksUpdateTranslator extends PacketTranslator<ClientboundSectionBlocksUpdatePacket> {
 
@@ -51,25 +53,35 @@ public void translate(GeyserSession session, ClientboundSectionBlocksUpdatePacke
             }
         }
 
+        BitSet waterlogged = BlockRegistries.WATERLOGGED.get();
+
         UpdateSubChunkBlocksPacket updateSubChunkBlocksPacket = new UpdateSubChunkBlocksPacket();
 
         for (BlockChangeEntry entry : packet.getEntries()) {
+            session.getWorldCache().removePrediction(entry.getPosition());
+
             int oldBlock = palette != null
                 ? palette.get(entry.getPosition().getX() & 0xF, entry.getPosition().getY() & 0xF, entry.getPosition().getZ() & 0xF)
                 : session.getGeyser().getWorldManager().getBlockAt(session, entry.getPosition());
             if (entry.getBlock() == oldBlock) {
+                // Skip unchanged blocks which may occur with older versions of Minecraft
                 continue;
             }
 
+            if (palette != null) {
+                palette.set(entry.getPosition().getX() & 0xF, entry.getPosition().getY() & 0xF, entry.getPosition().getZ() & 0xF, entry.getBlock());
+            }
+
             BlockState blockState = BlockState.of(entry.getBlock());
             if (blockState.is(Blocks.AIR)) {
                 ItemFrameEntity itemFrameEntity = ItemFrameEntity.getItemFrameEntity(session, entry.getPosition());
-                if (itemFrameEntity != null) {
+                if (itemFrameEntity != null) { // Item frame is still present and no block overrides that; refresh it
                     itemFrameEntity.updateBlock(true);
                     continue;
                 }
             }
             if (!(blockState.block() instanceof SkullBlock)) {
+                // Skull is gone
                 session.getSkullCache().removeSkull(entry.getPosition());
             }
 
@@ -81,8 +93,8 @@ public void translate(GeyserSession session, ClientboundSectionBlocksUpdatePacke
                 org.cloudburstmc.protocol.bedrock.data.BlockChangeEntry.MessageType.NONE
             ));
 
-            boolean isWaterlogged = BlockRegistries.WATERLOGGED.get().get(entry.getBlock());
-            if (BlockRegistries.WATERLOGGED.get().get(oldBlock) != isWaterlogged) {
+            boolean isWaterlogged = waterlogged.get(entry.getBlock());
+            if (waterlogged.get(oldBlock) != isWaterlogged) {
                 updateSubChunkBlocksPacket.getExtraBlocks().add(new org.cloudburstmc.protocol.bedrock.data.BlockChangeEntry(
                     entry.getPosition(),
                     isWaterlogged ? session.getBlockMappings().getBedrockWater() : session.getBlockMappings().getBedrockAir(),
@@ -91,10 +103,6 @@ public void translate(GeyserSession session, ClientboundSectionBlocksUpdatePacke
                     org.cloudburstmc.protocol.bedrock.data.BlockChangeEntry.MessageType.NONE
                 ));
             }
-
-            if (palette != null) {
-                palette.set(entry.getPosition().getX() & 0xF, entry.getPosition().getY() & 0xF, entry.getPosition().getZ() & 0xF, entry.getBlock());
-            }
         }
 
         session.sendUpstreamPacket(updateSubChunkBlocksPacket);