Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java

src/main/java/carpet/helpers/EntityPlayerActionPack.java

@@ -341,6 +341,7 @@ public class EntityPlayerActionPack
                 if (ap.currentBlock == null) return;
                 player.world.setBlockBreakingInfo(-1, ap.currentBlock, -1);
                 player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.server.getWorldHeight());
+                ap.currentBlock = null;
             }
         },
         JUMP(true)