From 8bd517ca91d165631cfd1b28cce5511f35baad4b Mon Sep 17 00:00:00 2001
From: ChampionAsh5357 <championash5357@gmail.com>
Date: Wed, 20 Oct 2021 15:01:48 -0400
Subject: [PATCH] Fix Breaking waterlogged blocks occasionally displays air for
 a frame Closes #7253 (#8128)

---
 .../net/minecraftforge/common/ForgeHooks.java | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index acd058ea89..f0f550a66f 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -537,7 +537,7 @@ public class ForgeHooks
         // Tell client the block is gone immediately then process events
         if (world.getBlockEntity(pos) == null)
         {
-            entityPlayer.connection.send(new ClientboundBlockUpdatePacket(DUMMY_WORLD, pos));
+            entityPlayer.connection.send(new ClientboundBlockUpdatePacket(pos, world.getFluidState(pos).createLegacyBlock()));
         }
 
         // Post the block break event
@@ -1062,36 +1062,6 @@ public class ForgeHooks
         return false;
     }
 
-
-    private static final DummyBlockReader DUMMY_WORLD = new DummyBlockReader();
-    private static class DummyBlockReader implements BlockGetter {
-
-        @Override
-        public BlockEntity getBlockEntity(BlockPos pos) {
-            return null;
-        }
-
-        @Override
-        public BlockState getBlockState(BlockPos pos) {
-            return Blocks.AIR.defaultBlockState();
-        }
-
-        @Override
-        public FluidState getFluidState(BlockPos pos) {
-            return Fluids.EMPTY.defaultFluidState();
-        }
-
-        @Override
-        public int getHeight() {
-            return 0;
-        }
-
-        @Override
-        public int getMinBuildHeight() {
-            return 0;
-        }
-    }
-
     public static int onNoteChange(Level world, BlockPos pos, BlockState state, int old, int _new) {
         NoteBlockEvent.Change event = new NoteBlockEvent.Change(world, pos, state, old, _new);
         if (MinecraftForge.EVENT_BUS.post(event))